From 158b55fac0cf70397992b4eb998a9296377ceadf Mon Sep 17 00:00:00 2001 From: Thomas BOY Date: Tue, 2 Dec 2014 10:47:10 +0100 Subject: [PATCH] =?UTF-8?q?Centrage=20de=20l'image=20et=20positionnement?= =?UTF-8?q?=20des=20miniatures=20=C3=A0=20l'aide=20des=20scaleType?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../res/layout/activity_camera_view.xml | 2 +- .../org/geneanet/customcamera/CameraActivity.java | 13 +++++++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/android/customCamera/res/layout/activity_camera_view.xml b/src/android/customCamera/res/layout/activity_camera_view.xml index 861c8cf..fa6df74 100644 --- a/src/android/customCamera/res/layout/activity_camera_view.xml +++ b/src/android/customCamera/res/layout/activity_camera_view.xml @@ -22,7 +22,7 @@ android:layout_width="fill_parent" android:layout_height="fill_parent" android:alpha="0.2" - android:scaleType="fitXY" + android:scaleType="centerInside" android:src="@drawable/normal" /> diff --git a/src/android/customCamera/src/org/geneanet/customcamera/CameraActivity.java b/src/android/customCamera/src/org/geneanet/customcamera/CameraActivity.java index e3bb7d8..f39e65c 100644 --- a/src/android/customCamera/src/org/geneanet/customcamera/CameraActivity.java +++ b/src/android/customCamera/src/org/geneanet/customcamera/CameraActivity.java @@ -235,6 +235,12 @@ public class CameraActivity extends Activity { public void showMiniature(View view) { // Picture for the background. ImageView imageView = (ImageView) findViewById(R.id.normal); + if (!photoTaken) { + imageView.setScaleType(ImageView.ScaleType.FIT_END); + } + else { + imageView.setScaleType(ImageView.ScaleType.FIT_START); + } // Button for show miniature picture. final Button miniature = (Button) view; @@ -251,6 +257,7 @@ public class CameraActivity extends Activity { public void onClick(View v) { modeMiniature = false; ImageView imageView = (ImageView) findViewById(R.id.normal); + imageView.setScaleType(ImageView.ScaleType.CENTER_INSIDE); // resize miniature. LayoutParams paramsReagrandissement = (LayoutParams) imageView.getLayoutParams(); paramsReagrandissement.width = -1; @@ -338,7 +345,8 @@ public class CameraActivity extends Activity { // If miniature mode when photo is taken, the miniature goes to the top if(modeMiniature){ - ImageView imageView = (ImageView) findViewById(R.id.normal); + ImageView imageView = (ImageView) findViewById(R.id.normal); + imageView.setScaleType(ImageView.ScaleType.FIT_START); setParamsMiniature(imageView, false); } @@ -379,7 +387,8 @@ public class CameraActivity extends Activity { // If mode miniature and photo is declined, the miniature goes back to the bottom if(modeMiniature) { - ImageView imageView = (ImageView) findViewById(R.id.normal); + ImageView imageView = (ImageView) findViewById(R.id.normal); + imageView.setScaleType(ImageView.ScaleType.FIT_END); setParamsMiniature(imageView, false); }