Fixed the new features.

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

Hide file tree

Showing 30 changed files with 261 additions and 182 deletions.
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
@@ -2,8 +2,8 @@
 <manifest
     xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.w9jds.gallery4glass"
-    android:versionCode="19"
-    android:versionName="0.5.0-beta">
+    android:versionCode="20"
+    android:versionName="0.5.1-beta">
 
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.GET_ACCOUNTS" />

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/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/out/production/Gallery4Glass/com/w9jds/gallery4glass/CameraActivity$3.class b/out/production/Gallery4Glass/com/w9jds/gallery4glass/CameraActivity$3.class
diff --git a/out/production/Gallery4Glass/com/w9jds/gallery4glass/CameraActivity$4.class b/out/production/Gallery4Glass/com/w9jds/gallery4glass/CameraActivity$4.class
diff --git a/out/production/Gallery4Glass/com/w9jds/gallery4glass/CameraActivity$5.class b/out/production/Gallery4Glass/com/w9jds/gallery4glass/CameraActivity$5.class
diff --git a/out/production/Gallery4Glass/com/w9jds/gallery4glass/CameraActivity$6.class b/out/production/Gallery4Glass/com/w9jds/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/Classes/StorageService.class b/out/production/Gallery4Glass/com/w9jds/gallery4glass/Classes/StorageService.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/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/OpenCV Library - 2.4.8/org/opencv/android/JavaCameraView$CameraWorker.class b/out/production/OpenCV Library - 2.4.8/org/opencv/android/JavaCameraView$CameraWorker.class
diff --git a/...production/OpenCV Library - 2.4.8/org/opencv/android/JavaCameraView$JavaCameraFrame.class b/...production/OpenCV Library - 2.4.8/org/opencv/android/JavaCameraView$JavaCameraFrame.class
diff --git a/...ion/OpenCV Library - 2.4.8/org/opencv/android/JavaCameraView$JavaCameraSizeAccessor.class b/...ion/OpenCV Library - 2.4.8/org/opencv/android/JavaCameraView$JavaCameraSizeAccessor.class
diff --git a/out/production/OpenCV Library - 2.4.8/org/opencv/android/JavaCameraView.class b/out/production/OpenCV Library - 2.4.8/org/opencv/android/JavaCameraView.class
diff --git a/res/menu/camera_menu.xml b/res/menu/camera_menu.xml
@@ -10,4 +10,8 @@
         android:id="@+id/white_balance_menu_item"
         android:title="@string/white_balance_label"/>
 
+    <!--<item-->
+        <!--android:id="@+id/color_effect_menu_item"-->
+        <!--android:title="@string/color_effect_label"/>-->
+
 </menu>
diff --git a/res/values/strings.xml b/res/values/strings.xml
@@ -18,6 +18,7 @@
     <string name="share_label">Share</string>
     <string name="scene_label">Set Scene Mode</string>
     <string name="white_balance_label">Set White Balance</string>
+    <string name="color_effect_label">Set Color Effect</string>
 
     <integer name="google_play_services_version">4242000</integer>
 

diff --git a/src/com/w9jds/gallery4glass/CameraActivity.java b/src/com/w9jds/gallery4glass/CameraActivity.java
@@ -46,6 +46,8 @@ public class CameraActivity extends Activity implements CameraBridgeViewBase.CvC
 {
     public static final String ACTION_WINK = "com.google.glass.action.EYE_GESTURE";
 
+
+    public static String msColorEffect = Camera.Parameters.EFFECT_NONE;
     //create an adapter for the cardscrollviewer
     private csaAdapter mcvAdapter;
     // Declare a new Gesture Detector
@@ -136,6 +138,8 @@ public void run()
                                 Camera.Parameters cParams = cCamera.getParameters();
 
                                 cParams.setSceneMode(lsScenes.get(position));
+
+                                cCamera.setParameters(cParams);
                             }
                         }, 2000);
 
@@ -185,6 +189,8 @@ public void run()
                                 Camera.Parameters cParams = cCamera.getParameters();
 
                                 cParams.setWhiteBalance(lsWhites.get(position));
+
+                                cCamera.setParameters(cParams);
                             }
                         }, 2000);
 
@@ -196,6 +202,60 @@ public void run()
 
                 return true;
 
+//            case R.id.color_effect_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> lsEffects = params.getSupportedColorEffects();
+//
+//                //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>)lsEffects);
+//                //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.setColorEffect(lsEffects.get(position));
+//
+//                                cCamera.setParameters(cParams);
+//                                cCamera.startPreview();
+//
+//                            }
+//                        }, 1000);
+//
+//                    }
+//                });
+//
+//                //set the view of this activity
+//                setContentView(csvCardsView);
+//
+//                return true;
+
             default:
                 return super.onOptionsItemSelected(iItem);
         }