Changeset 1456

Timestamp:

11/07/08 17:04:24 (2 months ago)

Author:

czue

Message:

updating the flow and image chooser activity to actually play with its commands and display a list of thumbnails. these can currently only be added from the camera control.

Location:

branches/dev/j2merosa/org.javarosa.ccptz

Files:

• build.properties (modified) (1 diff)
• src/org/javarosa/ccptz/shell/CCPTZShell.java (modified) (4 diffs)

branches/dev/j2merosa/org.javarosa.ccptz/build.properties

@@ -1 @@
-app.name=CCPTZShell
+app.name=CCPTZShellTest
 app.version=1.0.0
 app.vendor=OpenRosa Consortium

branches/dev/j2merosa/org.javarosa.ccptz/src/org/javarosa/ccptz/shell/CCPTZShell.java

@@ -37 +37 @@
 import org.javarosa.formmanager.view.chatterbox.widget.ExtendedWidgetsModule;
 import org.javarosa.j2me.storage.rms.RMSStorageModule;
+import org.javarosa.media.image.activity.FileBrowseActivity;
 import org.javarosa.media.image.activity.ImageCaptureActivity;
+import org.javarosa.media.image.activity.ImageChooserActivity;
 import org.javarosa.model.xform.XFormSerializingVisitor;
 import org.javarosa.model.xform.XFormsModule;
@@ -119 +121 @@
                         workflowLaunch(lastActivity, returnCode, returnVals);
                 } else {
+                        if (lastActivity != null)
+                                lastActivity.destroy();
                         if (stack.size() > 0) {
+                                
                                 workflowResume(stack.pop(), lastActivity, returnCode, returnVals);
                         } else {
@@ -182 +187 @@
                                 launchActivity(new ModelListActivity(this), context);
                         } else if (returnVal == Commands.CMD_CAMERA) {
-                                launchActivity(new ImageCaptureActivity(this), context);
+                                launchActivity(new ImageChooserActivity(this), context);
+                                //launchActivity(new FileBrowseActivity(this), context);
+                                //launchActivity(new ImageCaptureActivity(this), context);
                         } else if (returnVal == Commands.CMD_SELECT_XFORM) {
                                 launchFormEntryActivity(context, ((Integer)returnVals.get(FormListActivity.FORM_ID_KEY)).intValue(), -1);
@@ -231 +238 @@
                         launchActivity(new FormListActivity(this, "Forms List"), context);
                 }
+                else if (returningActivity instanceof ImageChooserActivity) 
+                { 
+                        if (returnCode.equals(Constants.ACTIVITY_NEEDS_RESOLUTION)) {
+                                IActivity next = (IActivity) returnVals.get(ImageChooserActivity.ACTIVITY_KEY);
+                                launchActivity(next, context);
+                        } else {
+                                launchActivity(new FormListActivity(this, "Forms List"), context);
+                        }
+                }
         }