README @@ -1 +1,3 @@ bin +sdcard.img +sdcard.img.lock .gitignore @@ -13,4 +13,24 @@ android:layout_width="fill_parent" android:layout_height="fill_parent" android:visibility="gone" /> + <RelativeLayout + android:id="@+id/photo_button_container" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:padding="10sp" + android:layout_gravity="bottom" + android:visibility="gone" + android:background="#44000000"> + <Button + android:id="@+id/photo_save_photo_button" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/save_photo" /> + <Button + android:id="@+id/photo_discard_photo_button" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/discard" + android:layout_alignParentRight="true" /> + </RelativeLayout> </FrameLayout> \ No newline at end of file pictures/res/layout/main.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <resources> - <string name="hello">Hello World, Camera</string> <string name="app_name">Pictures</string> + <string name="save_photo">Save Photo</string> + <string name="discard">Discard</string> </resources> pictures/res/values/strings.xml @@ -14,15 +14,19 @@ public final class R { public static final int icon=0x7f020000; } public static final class id { + public static final int photo_button_container=0x7f050003; public static final int photo_camera_surface=0x7f050001; + public static final int photo_discard_photo_button=0x7f050005; public static final int photo_preview=0x7f050002; + public static final int photo_save_photo_button=0x7f050004; public static final int take_photo_root_view=0x7f050000; } public static final class layout { public static final int main=0x7f030000; } public static final class string { - public static final int app_name=0x7f040001; - public static final int hello=0x7f040000; + public static final int app_name=0x7f040000; + public static final int discard=0x7f040002; + public static final int save_photo=0x7f040001; } } pictures/src/com/w2e/pictures/R.java @@ -3,7 +3,10 @@ package com.w2e.pictures.activity; import com.w2e.pictures.R; import android.app.Activity; +import android.content.Intent; +import android.net.Uri; import android.os.Bundle; +import android.provider.MediaStore; import android.graphics.Bitmap; import android.graphics.BitmapFactory; @@ -14,6 +17,7 @@ import android.view.KeyEvent; import android.view.SurfaceHolder; import android.view.SurfaceView; import android.view.View; +import android.widget.Button; import android.widget.ImageView; public class CameraActivity extends Activity implements SurfaceHolder.Callback { @@ -24,10 +28,11 @@ public class CameraActivity extends Activity implements SurfaceHolder.Callback { private SurfaceView surface; private SurfaceHolder surfaceHolder; protected Bitmap currentBitmap; - protected Bitmap scaledBitmap; protected ImageView previewImageView; - + private Button savePhotoButton; + private Button discardPhotoButton; private boolean inPreviewMode; + private View buttonContainer; @Override public void onCreate(Bundle icicle) { @@ -58,12 +63,15 @@ public class CameraActivity extends Activity implements SurfaceHolder.Callback { } private void showBitmapPreview() { - surface.setVisibility(View.GONE); + surface.setVisibility(View.VISIBLE); previewImageView.setVisibility(View.VISIBLE); previewImageView.setImageBitmap(currentBitmap); + buttonContainer.setVisibility(View.VISIBLE); } private void showCameraPreview() { + buttonContainer.setVisibility(View.GONE); + surface.setVisibility(View.GONE); previewImageView.setVisibility(View.GONE); surface.setVisibility(View.VISIBLE); previewImageView.setImageBitmap(null); @@ -75,6 +83,20 @@ public class CameraActivity extends Activity implements SurfaceHolder.Callback { camera.startPreview(); } + protected void saveCurrentPhoto() { + String photoPath = MediaStore.Images.Media.insertImage( + getContentResolver(), currentBitmap, "A Sweet Picture", "A Sweet Picture" + ); + if (photoPath == null) { + Log.e(getClass().getName(), + "Error saving photo to image library"); + return; + } else { + Uri photoURI = Uri.parse(photoPath); + sendBroadcast(new Intent(Intent.ACTION_MEDIA_SCANNER_SCAN_FILE, photoURI)); + } + } + public void surfaceCreated(SurfaceHolder holder) { Log.e(LOG_TAG, "opening camera"); camera = Camera.open(); @@ -110,12 +132,27 @@ public class CameraActivity extends Activity implements SurfaceHolder.Callback { protected void setUpViews() { previewImageView = (ImageView)findViewById(R.id.photo_preview); surface = (SurfaceView)findViewById(R.id.photo_camera_surface); + savePhotoButton = (Button)findViewById(R.id.photo_save_photo_button); + discardPhotoButton = (Button)findViewById(R.id.photo_discard_photo_button); + buttonContainer = findViewById(R.id.photo_button_container); surfaceHolder = surface.getHolder(); surfaceHolder.addCallback(this); surfaceHolder.setType(SurfaceHolder.SURFACE_TYPE_PUSH_BUFFERS); + + savePhotoButton.setOnClickListener(new View.OnClickListener() { + public void onClick(View v) { + saveCurrentPhoto(); + } + }); + + discardPhotoButton.setOnClickListener(new View.OnClickListener() { + public void onClick(View v) { + discardPhoto(); + } + }); } - protected void discardPhoto() { + protected void discardPhoto() { showCameraPreview(); } pictures/src/com/w2e/pictures/activity/CameraActivity.java d5e72d19be44367a813378a4a70ca1537f3265a7 Tony Hillerson tony.hillerson@effectiveui.com http://github.com/thillerson/first_android_experience/commit/f795bd0ef8dfaea35dc3c56e66c95e150a426ad8 f795bd0ef8dfaea35dc3c56e66c95e150a426ad8 2009-03-30T16:40:48-07:00 2009-03-30T16:40:48-07:00 added sample camera activity 3039819a26e9d733f41ec6d571da7c0fa15b7df4 Tony Hillerson tony.hillerson@effectiveui.com