public/customCamera
public/customCamera
9
0
Fork 0
mirror of https://gitee.com/shuto/customCamera.git synced 2024-10-06 10:22:07 +08:00
Code Issues Projects Releases Wiki Activity

Déplacement du code pour regrouper les override d'activité ensemble.

Browse Source
This commit is contained in:
Thomas BOY 2015-02-09 15:47:29 +01:00
parent e7016f24e1
commit 8e1f2faa14
1 changed files with 47 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

93
src/android/customCamera/src/org/geneanet/customcamera/CameraActivity.java
View File

@ -156,8 +156,6 @@ public class CameraActivity extends Activity {
opacity = this.getIntent().getBooleanExtra("opacity", true);
setBackground();
if (!this.getIntent().getBooleanExtra("miniature", true)) {
Button miniature = (Button) findViewById(R.id.miniature);
miniature.setVisibility(View.INVISIBLE);
@ -228,35 +226,19 @@ public class CameraActivity extends Activity {
});
}
/**
* Set the background color of the camera button.
* @param color The color of the background.
*/
protected void setCameraBackgroundColor(String color) {
ImageButton imgIcon = (ImageButton)findViewById(R.id.capture);
GradientDrawable backgroundGradient = (GradientDrawable)imgIcon.getBackground();
if (color.length() > 0) {
try {
int cameraBackgroundColor = Color.parseColor(color);
backgroundGradient.setColor(cameraBackgroundColor);
} catch (IllegalArgumentException e) {
backgroundGradient.setColor(Color.TRANSPARENT);
}
} else {
backgroundGradient.setColor(Color.TRANSPARENT);
}
}
/** Method onStart. Handle the zoom level seekBar and the camera orientation. */
@Override
protected void onStart() {
super.onStart();
setBackground();
// Init camera resource.
if (!initCameraResource(null)) {
return;
}
// Adapt camera_preview to keep a ratio between screen' size and camera' size.
DisplayMetrics dm = new DisplayMetrics();
getWindowManager().getDefaultDisplay().getMetrics(dm);
@ -305,6 +287,31 @@ public class CameraActivity extends Activity {
}
}
/** To save some contains of the activity. */
@Override
protected void onSaveInstanceState(Bundle outState) {
outState.putBoolean("modeMiniature", modeMiniature);
outState.putParcelable("photoTaken", photoTaken);
outState.putInt("stateFlash", stateFlash);
super.onSaveInstanceState(outState);
}
/** To restore the contains saved on the method onSaveInstanceState(). */
@Override
protected void onRestoreInstanceState(Bundle savedInstanceState) {
modeMiniature = savedInstanceState.getBoolean("modeMiniature");
photoTaken = savedInstanceState.getParcelable("photoTaken");
stateFlash = savedInstanceState.getInt("stateFlash");
if (modeMiniature) {
buttonMiniature(findViewById(R.id.miniature));
}
displayPicture();
updateStateFlash(stateFlash);
super.onRestoreInstanceState(savedInstanceState);
}
/** Method to pause the activity. */
@Override
protected void onPause() {
@ -339,6 +346,25 @@ public class CameraActivity extends Activity {
return true;
}
/**
* Set the background color of the camera button.
* @param color The color of the background.
*/
protected void setCameraBackgroundColor(String color) {
ImageButton imgIcon = (ImageButton)findViewById(R.id.capture);
GradientDrawable backgroundGradient = (GradientDrawable)imgIcon.getBackground();
if (color.length() > 0) {
try {
int cameraBackgroundColor = Color.parseColor(color);
backgroundGradient.setColor(cameraBackgroundColor);
} catch (IllegalArgumentException e) {
backgroundGradient.setColor(Color.TRANSPARENT);
}
} else {
backgroundGradient.setColor(Color.TRANSPARENT);
}
}
/**
* Determine the space between the first two fingers.
* @param MotionEvent event Current event which start this calculation.
@ -774,31 +800,6 @@ public class CameraActivity extends Activity {
displayPicture();
}
/** To save some contains of the activity. */
@Override
protected void onSaveInstanceState(Bundle outState) {
outState.putBoolean("modeMiniature", modeMiniature);
outState.putParcelable("photoTaken", photoTaken);
outState.putInt("stateFlash", stateFlash);
super.onSaveInstanceState(outState);
}
/** To restore the contains saved on the method onSaveInstanceState(). */
@Override
protected void onRestoreInstanceState(Bundle savedInstanceState) {
modeMiniature = savedInstanceState.getBoolean("modeMiniature");
photoTaken = savedInstanceState.getParcelable("photoTaken");
stateFlash = savedInstanceState.getInt("stateFlash");
if (modeMiniature) {
buttonMiniature(findViewById(R.id.miniature));
}
displayPicture();
updateStateFlash(stateFlash);
super.onRestoreInstanceState(savedInstanceState);
}
/** To display or not the picture taken. */
protected void displayPicture() {
FrameLayout preview = (FrameLayout) findViewById(R.id.camera_preview);