public/customCamera
9
0
Fork 0
mirror of https://gitee.com/shuto/customCamera.git synced 2026-05-02 00:07:24 +08:00
Code Issues Projects Releases Wiki Activity

Use gone and not invisible to hide elements. As this, the alignment is kept

Browse Source
This commit is contained in:
Christophe BOUCAUT
2015-06-02 15:17:54 +02:00
parent d3cbdef908
commit 47e3d7a882
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/android/customCamera/src/org/geneanet/customcamera/CameraActivity.java
+14 -14
View File
@@ -134,7 +134,7 @@ public class CameraActivity extends Activity {
zoomLevel.setProgress(zoom); zoomLevel.setProgress(zoom);
zoomLevel.setVisibility(View.VISIBLE); zoomLevel.setVisibility(View.VISIBLE);
} else { } else {
zoomLevel.setVisibility(View.INVISIBLE); zoomLevel.setVisibility(View.GONE);
} }
updateStateFlash(stateFlash); updateStateFlash(stateFlash);
@@ -270,7 +270,7 @@ public class CameraActivity extends Activity {
// Hide the switch camera button if the number of cameras is lower than 2. // Hide the switch camera button if the number of cameras is lower than 2.
if(Camera.getNumberOfCameras() < 2){ if(Camera.getNumberOfCameras() < 2){
ImageButton switchCamera = (ImageButton) findViewById(R.id.switchCamera); ImageButton switchCamera = (ImageButton) findViewById(R.id.switchCamera);
switchCamera.setVisibility(View.INVISIBLE); switchCamera.setVisibility(View.GONE);
} }
} }
@@ -480,7 +480,7 @@ public class CameraActivity extends Activity {
// Set new size for miniature layout. // Set new size for miniature layout.
setParamsMiniature(background, true); setParamsMiniature(background, true);
// Hide the miniature button. // Hide the miniature button.
miniature.setVisibility(View.INVISIBLE); miniature.setVisibility(View.GONE);
// Add event on click action for the miniature picture. // Add event on click action for the miniature picture.
background.setOnClickListener(new View.OnClickListener() { background.setOnClickListener(new View.OnClickListener() {
@@ -548,19 +548,19 @@ public class CameraActivity extends Activity {
Camera.Parameters paramsCamera = customCamera.getParameters(); Camera.Parameters paramsCamera = customCamera.getParameters();
if (!this.getIntent().getBooleanExtra("miniature", true)) { if (!this.getIntent().getBooleanExtra("miniature", true)) {
miniature.setVisibility(View.INVISIBLE); miniature.setVisibility(View.GONE);
} }
if (!opacity) { if (!opacity) {
switchOpacity.setVisibility(View.INVISIBLE); switchOpacity.setVisibility(View.GONE);
} }
if (photoTaken != null) { if (photoTaken != null) {
// Show/hide elements when a photo is taken // Show/hide elements when a photo is taken
keepPhoto.setVisibility(View.VISIBLE); keepPhoto.setVisibility(View.VISIBLE);
photo.setVisibility(View.INVISIBLE); photo.setVisibility(View.GONE);
zoomLevel.setVisibility(View.INVISIBLE); zoomLevel.setVisibility(View.GONE);
flash.setVisibility(View.INVISIBLE); flash.setVisibility(View.GONE);
switchCamera.setVisibility(View.INVISIBLE); switchCamera.setVisibility(View.GONE);
((LinearLayout.LayoutParams) paramsLayoutMiniature).gravity = Gravity.TOP; ((LinearLayout.LayoutParams) paramsLayoutMiniature).gravity = Gravity.TOP;
miniature.setLayoutParams(paramsLayoutMiniature); miniature.setLayoutParams(paramsLayoutMiniature);
@@ -571,7 +571,7 @@ public class CameraActivity extends Activity {
} else { } else {
// Show/hide elements when a photo is not taken // Show/hide elements when a photo is not taken
keepPhoto.setVisibility(View.INVISIBLE); keepPhoto.setVisibility(View.GONE);
photo.setVisibility(View.VISIBLE); photo.setVisibility(View.VISIBLE);
if (paramsCamera.isZoomSupported()) { if (paramsCamera.isZoomSupported()) {
zoomLevel.setVisibility(View.VISIBLE); zoomLevel.setVisibility(View.VISIBLE);
@@ -580,13 +580,13 @@ public class CameraActivity extends Activity {
if (this.getIntent().getBooleanExtra("switchFlash", true) && hasFlash()) { if (this.getIntent().getBooleanExtra("switchFlash", true) && hasFlash()) {
flash.setVisibility(View.VISIBLE); flash.setVisibility(View.VISIBLE);
} else { } else {
flash.setVisibility(View.INVISIBLE); flash.setVisibility(View.GONE);
} }
if (this.getIntent().getBooleanExtra("switchCamera", true)) { if (this.getIntent().getBooleanExtra("switchCamera", true)) {
switchCamera.setVisibility(View.VISIBLE); switchCamera.setVisibility(View.VISIBLE);
} else { } else {
switchCamera.setVisibility(View.INVISIBLE); switchCamera.setVisibility(View.GONE);
} }
((LinearLayout.LayoutParams) paramsLayoutMiniature).gravity = Gravity.BOTTOM; ((LinearLayout.LayoutParams) paramsLayoutMiniature).gravity = Gravity.BOTTOM;
@@ -814,10 +814,10 @@ public class CameraActivity extends Activity {
Bitmap newBitmap = resizePictureTaken(); Bitmap newBitmap = resizePictureTaken();
photoResized.setImageBitmap(newBitmap); photoResized.setImageBitmap(newBitmap);
photoResized.setVisibility(View.VISIBLE); photoResized.setVisibility(View.VISIBLE);
preview.setVisibility(View.INVISIBLE); preview.setVisibility(View.GONE);
} else { } else {
customCamera.startPreview(); customCamera.startPreview();
photoResized.setVisibility(View.INVISIBLE); photoResized.setVisibility(View.GONE);
preview.setVisibility(View.VISIBLE); preview.setVisibility(View.VISIBLE);
} }