Release 19 (beta 5) for XE16

w9jds · Apr 16, 2014 · a6b7b21 · a6b7b21
1 parent ae7efdb
commit a6b7b21
Show file tree

Hide file tree

Showing 30 changed files with 280 additions and 89 deletions.
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/Gallery4Glass.apk b/Gallery4Glass.apk
diff --git a/out/production/Gallery4Glass/Gallery4Glass.apk b/out/production/Gallery4Glass/Gallery4Glass.apk
diff --git a/out/production/Gallery4Glass/Gallery4Glass.unaligned.apk b/out/production/Gallery4Glass/Gallery4Glass.unaligned.apk
diff --git a/...oduction/Gallery4Glass/com/w9jds/gallery4glass/Adapters/csaAdapter$BitmapWorkerTask.class b/...oduction/Gallery4Glass/com/w9jds/gallery4glass/Adapters/csaAdapter$BitmapWorkerTask.class
diff --git a/out/production/Gallery4Glass/com/w9jds/gallery4glass/BuildConfig.class b/out/production/Gallery4Glass/com/w9jds/gallery4glass/BuildConfig.class
diff --git a/out/production/Gallery4Glass/com/w9jds/gallery4glass/CameraActivity$1$1.class b/out/production/Gallery4Glass/com/w9jds/gallery4glass/CameraActivity$1$1.class
diff --git a/out/production/Gallery4Glass/com/w9jds/gallery4glass/CameraActivity$1.class b/out/production/Gallery4Glass/com/w9jds/gallery4glass/CameraActivity$1.class
diff --git a/out/production/Gallery4Glass/com/w9jds/gallery4glass/CameraActivity$2$1.class b/out/production/Gallery4Glass/com/w9jds/gallery4glass/CameraActivity$2$1.class
diff --git a/out/production/Gallery4Glass/com/w9jds/gallery4glass/CameraActivity$2.class b/out/production/Gallery4Glass/com/w9jds/gallery4glass/CameraActivity$2.class
diff --git a/...9jds/gallery4glass/CameraActivity$3.class → ...9jds/gallery4glass/CameraActivity$5.class b/...9jds/gallery4glass/CameraActivity$3.class → ...9jds/gallery4glass/CameraActivity$5.class
diff --git a/...9jds/gallery4glass/CameraActivity$4.class → ...9jds/gallery4glass/CameraActivity$6.class b/...9jds/gallery4glass/CameraActivity$4.class → ...9jds/gallery4glass/CameraActivity$6.class
diff --git a/out/production/Gallery4Glass/com/w9jds/gallery4glass/CameraActivity$SavePhotoTask.class b/out/production/Gallery4Glass/com/w9jds/gallery4glass/CameraActivity$SavePhotoTask.class
diff --git a/out/production/Gallery4Glass/com/w9jds/gallery4glass/CameraActivity.class b/out/production/Gallery4Glass/com/w9jds/gallery4glass/CameraActivity.class
diff --git a/out/production/Gallery4Glass/com/w9jds/gallery4glass/EffectActivity.class b/out/production/Gallery4Glass/com/w9jds/gallery4glass/EffectActivity.class
diff --git a/out/production/Gallery4Glass/com/w9jds/gallery4glass/MainActivity.class b/out/production/Gallery4Glass/com/w9jds/gallery4glass/MainActivity.class
diff --git a/out/production/Gallery4Glass/com/w9jds/gallery4glass/R$id.class b/out/production/Gallery4Glass/com/w9jds/gallery4glass/R$id.class
diff --git a/out/production/Gallery4Glass/com/w9jds/gallery4glass/R$integer.class b/out/production/Gallery4Glass/com/w9jds/gallery4glass/R$integer.class
diff --git a/out/production/Gallery4Glass/com/w9jds/gallery4glass/R$layout.class b/out/production/Gallery4Glass/com/w9jds/gallery4glass/R$layout.class
diff --git a/out/production/Gallery4Glass/com/w9jds/gallery4glass/R$menu.class b/out/production/Gallery4Glass/com/w9jds/gallery4glass/R$menu.class
diff --git a/out/production/Gallery4Glass/com/w9jds/gallery4glass/R$string.class b/out/production/Gallery4Glass/com/w9jds/gallery4glass/R$string.class
diff --git a/out/production/Gallery4Glass/com/w9jds/gallery4glass/R$style.class b/out/production/Gallery4Glass/com/w9jds/gallery4glass/R$style.class
diff --git a/out/production/Gallery4Glass/com/w9jds/gallery4glass/R$styleable.class b/out/production/Gallery4Glass/com/w9jds/gallery4glass/R$styleable.class
diff --git a/out/production/Gallery4Glass/com/w9jds/gallery4glass/R$xml.class b/out/production/Gallery4Glass/com/w9jds/gallery4glass/R$xml.class
diff --git a/out/production/Gallery4Glass/com/w9jds/gallery4glass/R.class b/out/production/Gallery4Glass/com/w9jds/gallery4glass/R.class
diff --git a/out/production/Gallery4Glass/com/w9jds/gallery4glass/VignetteActivity.class b/out/production/Gallery4Glass/com/w9jds/gallery4glass/VignetteActivity.class
diff --git a/out/production/Gallery4Glass/org/opencv/BuildConfig.class b/out/production/Gallery4Glass/org/opencv/BuildConfig.class
diff --git a/out/production/OpenCV Library - 2.4.8/org/opencv/BuildConfig.class b/out/production/OpenCV Library - 2.4.8/org/opencv/BuildConfig.class
diff --git a/res/xml/gallery_voice_trigger.xml b/res/xml/gallery_voice_trigger.xml
@@ -1,5 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<trigger keyword="@string/gallery_voice_trigger">
-    <constraints network="true" />
-</trigger>
+<trigger keyword="@string/gallery_voice_trigger"/>
diff --git a/src/com/w9jds/gallery4glass/CameraActivity.java b/src/com/w9jds/gallery4glass/CameraActivity.java
@@ -12,21 +12,24 @@
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.os.Environment;
+import android.os.Handler;
 import android.util.Log;
 import android.view.KeyEvent;
 import android.view.Menu;
 import android.view.MotionEvent;
+import android.view.View;
+import android.widget.AdapterView;
 
 import com.google.analytics.tracking.android.EasyTracker;
 import com.google.analytics.tracking.android.MapBuilder;
 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.CardScrollView;
+import com.w9jds.gallery4glass.Adapters.csaAdapter;
 import com.w9jds.gallery4glass.Classes.Gallery4Glass;
 import com.w9jds.gallery4glass.Classes.SingleMediaScanner;
 import com.w9jds.gallery4glass.Widget.OpenCVSurface;
-import com.w9jds.gallery4glass.Widget.SliderView;
-
 
 import org.opencv.android.CameraBridgeViewBase;
 import org.opencv.android.OpenCVLoader;
@@ -35,13 +38,16 @@
 import java.io.File;
 import java.io.FileOutputStream;
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
 public class CameraActivity extends Activity implements CameraBridgeViewBase.CvCameraViewListener2
 {
     public static final String ACTION_WINK = "com.google.glass.action.EYE_GESTURE";
 
+    //create an adapter for the cardscrollviewer
+    private csaAdapter mcvAdapter;
     // Declare a new Gesture Detector
     private GestureDetector mGestureDetector;
     // Declare a new Camera Preview Surface
@@ -85,16 +91,109 @@ public boolean onCreateOptionsMenu(Menu menu)
     @Override
     public boolean onOptionsItemSelected(android.view.MenuItem iItem)
     {
-        SliderView svProgress;
+        CardScrollView csvCardsView;
+        final Camera cCamera;
+        Camera.Parameters params;
 
         switch (iItem.getItemId())
         {
             case R.id.scene_menu_item:
 
+                cCamera = mPreviewSurface.getCamera();
+
+                params = cCamera.getParameters();
+                mPreviewSurface.disableView();
+
+                //add a card to the card scroll view for each supported Scenes that is available
+                final List<String> lsScenes = params.getSupportedSceneModes();
+
+                //create a new card scroll viewer for this context
+                csvCardsView = new CardScrollView(this);
+                //create a new adapter for the scroll viewer
+                mcvAdapter = new csaAdapter(this, (ArrayList<String>)lsScenes);
+                //set this adapter as the adapter for the scroll viewer
+                csvCardsView.setAdapter(mcvAdapter);
+                //activate this scroll viewer
+                csvCardsView.activate();
+                //add a listener to the scroll viewer that is fired when an item is clicked
+                csvCardsView.setOnItemClickListener(new AdapterView.OnItemClickListener()
+                {
+                    @Override
+                    public void onItemClick(AdapterView<?> parent, View view, final int position, long id)
+                    {
+
+                        //play the tap sound
+                        maManager.playSoundEffect(Sounds.TAP);
+
+                        setPreviewSurface();
+
+                        new Handler().postDelayed(new Runnable()
+                        {
+                            public void run()
+                            {
+                                Camera cCamera = mPreviewSurface.getCamera();
+
+                                Camera.Parameters cParams = cCamera.getParameters();
+
+                                cParams.setSceneMode(lsScenes.get(position));
+                            }
+                        }, 2000);
+
+                    }
+                });
+
+                //set the view of this activity
+                setContentView(csvCardsView);
+
                 return true;
 
             case R.id.white_balance_menu_item:
 
+                cCamera = mPreviewSurface.getCamera();
+
+                params = cCamera.getParameters();
+                mPreviewSurface.disableView();
+                //add a card to the card scroll view for each supported White Balances that is available
+                final List<String> lsWhites = params.getSupportedWhiteBalance();
+
+
+                //create a new card scroll viewer for this context
+                csvCardsView = new CardScrollView(this);
+                //create a new adapter for the scroll viewer
+                mcvAdapter = new csaAdapter(this, (ArrayList<String>)lsWhites);
+                //set this adapter as the adapter for the scroll viewer
+                csvCardsView.setAdapter(mcvAdapter);
+                //activate this scroll viewer
+                csvCardsView.activate();
+                //add a listener to the scroll viewer that is fired when an item is clicked
+                csvCardsView.setOnItemClickListener(new AdapterView.OnItemClickListener()
+                {
+                    @Override
+                    public void onItemClick(AdapterView<?> parent, View view, final int position, long id)
+                    {
+                        //play the tap sound
+                        maManager.playSoundEffect(Sounds.TAP);
+
+                        setPreviewSurface();
+
+                        new Handler().postDelayed(new Runnable()
+                        {
+                            public void run()
+                            {
+                                Camera cCamera = mPreviewSurface.getCamera();
+
+                                Camera.Parameters cParams = cCamera.getParameters();
+
+                                cParams.setWhiteBalance(lsWhites.get(position));
+                            }
+                        }, 2000);
+
+                    }
+                });
+
+                //set the view of this activity
+                setContentView(csvCardsView);
+
                 return true;
 
             default:
@@ -160,7 +259,7 @@ private GestureDetector createGestureDetector(final Context cContext)
         GestureDetector gestureDetector = new GestureDetector(cContext);
 
         //Create a base listener for generic gestures
-        gestureDetector.setBaseListener( new GestureDetector.BaseListener()
+        gestureDetector.setBaseListener(new GestureDetector.BaseListener()
         {
             @Override
             public boolean onGesture(Gesture gGesture)
@@ -185,14 +284,7 @@ public boolean onGesture(Gesture gGesture)
                     }
 
                     else if (gGesture == Gesture.TWO_LONG_PRESS)
-                    {
-                        Camera cCamera = mPreviewSurface.getCamera();
-
-                        Camera.Parameters params = cCamera.getParameters();
-
-                        List<String> test = params.getSupportedSceneModes();
-                        List<String> test3 = params.getSupportedWhiteBalance();
-                    }
+                        openOptionsMenu();
 
                     else if (gGesture == Gesture.SWIPE_DOWN)
                     {