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

Fix bug where texts "-" and "+" aren't hidden after that we took a picture.

Browse Source
This commit is contained in:
Christophe BOUCAUT
2015-06-03 12:49:19 +02:00
parent 0e66be0099
commit 609035de49
2 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/android/customCamera/res/layout/activity_camera_view.xml
+2 -2
View File
@@ -91,7 +91,7 @@
android:orientation="horizontal" >
<TextView
android:id="@+id/textView1"
android:id="@+id/textZoomMin"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="0.2"
@@ -108,7 +108,7 @@
android:visibility="visible" />
<TextView
android:id="@+id/textView2"
android:id="@+id/textZoomMax"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="0.2"
src/android/customCamera/src/org/geneanet/customcamera/CameraActivity.java
+19 -5
View File
@@ -34,6 +34,7 @@ import android.widget.LinearLayout;
import android.widget.RelativeLayout;
import android.widget.SeekBar;
import android.widget.SeekBar.OnSeekBarChangeListener;
import android.widget.TextView;
import org.geneanet.customcamera.CameraPreview;
import org.geneanet.customcamera.ManagerCamera;
@@ -132,9 +133,9 @@ public class CameraActivity extends Activity {
zoomLevel.setMax(maxZoom);
zoomLevel.setProgress(zoom);
zoomLevel.setVisibility(View.VISIBLE);
displayZoomLevel(View.VISIBLE);
} else {
zoomLevel.setVisibility(View.GONE);
displayZoomLevel(View.GONE);
}
updateStateFlash(stateFlash);
@@ -406,7 +407,7 @@ public class CameraActivity extends Activity {
SeekBar zoomLevel = (SeekBar) findViewById(R.id.zoomLevel);
zoomLevel.setMax(maxZoom);
zoomLevel.setProgress(zoom * 2);
zoomLevel.setVisibility(View.VISIBLE);
displayZoomLevel(View.VISIBLE);
}
/** To set background in the view. */
@@ -495,6 +496,19 @@ public class CameraActivity extends Activity {
});
}
/**
* To manage the display of the zoom bar.
* @param displayStatus
*/
public void displayZoomLevel(int displayStatus) {
TextView textZoomMin = (TextView) findViewById(R.id.textZoomMin);
TextView textZoomMax = (TextView) findViewById(R.id.textZoomMax);
SeekBar zoomLevel = (SeekBar) findViewById(R.id.zoomLevel);
textZoomMin.setVisibility(displayStatus);
textZoomMax.setVisibility(displayStatus);
zoomLevel.setVisibility(displayStatus);
}
/**
* Set the size and the gravity of the miniature function of photo is taken or not.
* @param imageView Reference to the background image.
@@ -558,7 +572,7 @@ public class CameraActivity extends Activity {
// Show/hide elements when a photo is taken
keepPhoto.setVisibility(View.VISIBLE);
photo.setVisibility(View.GONE);
zoomLevel.setVisibility(View.GONE);
displayZoomLevel(View.GONE);
flash.setVisibility(View.GONE);
switchCamera.setVisibility(View.GONE);
@@ -574,7 +588,7 @@ public class CameraActivity extends Activity {
keepPhoto.setVisibility(View.GONE);
photo.setVisibility(View.VISIBLE);
if (paramsCamera.isZoomSupported()) {
zoomLevel.setVisibility(View.VISIBLE);
displayZoomLevel(View.VISIBLE);
}
if (this.getIntent().getBooleanExtra("switchFlash", true) && hasFlash()) {