From 5b2700ca68ebb532b3eb53115b00f262a5a4f7df Mon Sep 17 00:00:00 2001
From: Thomas BOY <thomas.boy@geneanet.org>
Date: Mon, 26 Jan 2015 15:18:34 +0100
Subject: [PATCH] =?UTF-8?q?Ajout=20du=20flash=20=C3=A0=20la=20camera?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../customCamera/res/drawable-hdpi/flash.png  | Bin 0 -> 1248 bytes
 .../res/drawable-hdpi/no_flash.png            | Bin 0 -> 2436 bytes
 .../res/layout/activity_camera_view.xml       |  18 ++++++
 .../geneanet/customcamera/CameraActivity.java |  55 ++++++++++++++++++
 4 files changed, 73 insertions(+)
 create mode 100644 src/android/customCamera/res/drawable-hdpi/flash.png
 create mode 100644 src/android/customCamera/res/drawable-hdpi/no_flash.png

diff --git a/src/android/customCamera/res/drawable-hdpi/flash.png b/src/android/customCamera/res/drawable-hdpi/flash.png
new file mode 100644
index 0000000000000000000000000000000000000000..9d408d4dbe07e6def9f8bd0930f0b112a6684828
GIT binary patch
literal 1248
zcmV<61Rwi}P)<h;3K|Lk000e1NJLTq003qH003qP1^@s6Ip5@B00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-vJs8D+kTAVTb?#1Z_z~
zK~#9!?Oj`z>mUp(99A;>U(?-6=I3@!nvw*AEz5-b&BK&NNH#W3(zb1{b@5$AYLHU;
z_*n|<vTw7`BZH2D`gHp%Q1i&7B&%iF%b1qeP4%%K_AyVssb@D7VV@T$vI}LO7bu+e
zWj6VkW&Y`C5YbUuUmlC9M4*34>9zfP!BQ0I=asyfo+E(5&J+#%<M%8PG}(hKo+0(N
zZS|;(B_#D?i}yaK8ZNU%KVH7Yd-GWqD0*zyw9W5dB7I7WJzB=n&-d10Wd2fnQA)-u
z&EWwGgM4)ZgN)u#GA50}P=NwnJ;oyvYn3qMKBriN(nEhVTUg{v#2DmCVPngx$2hU2
zXMv$MpS1NDMhQbEGz-h5P#NUAD9ls7_G4u4=)=Reu!Hg?WuEedWDBEDIgU}hL1AEv
zH&bf%!}S=Am4aeR6i`&^F&1A6C1I?fRKsO-NQ~OIH2XRNP`<+D8BfF1B#fCUAHZnb
z(4I+Iv!y0sjG%~9GTJiXaqZ{E3QEmh)VQQ6UkJ9`=H(O?lohB+Qx_%n9`$@}X|!Zo
z>P?pn0U8h#2@^H$U$&(0Y?m~p6RRE*m@UXa!K5BjJE9YvWfBQfNocm_k2K=+sBD3Q
zlG1m$%v^b7_bZx#609B**|&_8FM1cXN<HRkQj8s9+7f25rO1|`%(R(=?(@9sG0`O~
zY&{0uJBgGq%6g2pql+eCq3bab+0t_If7N3M{mQicF_HZWy2w^62HpKFosBW_WIVJ)
zB7BM%7?h^A+FO8f#TKvc?^2IpI(K#zg{}UWRzQ{6autPnAKWMwH`QDIM%nA(Q<{Kz
z0x0OS%u<!1=#OdnY)u)9aF&^-KL*Vp_G7c=^_Wq6?bHtHEc57s&g`IAhsJFCwD)II
z_QzNj+1SrA)AYw^+qX&>dn-m^nN)2xYq8}hVT?Y7sy_zBl>PXOK1H08@$e}YA+j|n
zQ`TcFpI5f`E0I7sP04sp%3?zqq32S}7>_Td$(ATRmtBm}lrKan`l|31CD0MqxyAn<
z_=LYF(~9<>(HoPjqED52jF$w>%oM47s@7w+ZR>jU)RM1ndy{%hL~xiu`H(WJ_P(fq
zAbm>B{xsH~z31|d)sKE&nKvk-dmYP+K(U(Ce<mh2*6cyiRtnYLqWuJ|a$gMK+yTM_
z${%BpX$ntYVwpP|y?@6GQjhTppZ6?bPH0w@29l6_OC|VyV|O)v=C{#8>M_WE|60Ul
zb;QWh9#W4%WdtOku=$iO#;|7u&h{nI%E`^ZSj73-dm9NTp<X+WZrafb1elwSH0m)K
zC13lDz^K2828z@txxGJTWW0!=^w_J#`dyE(6{Kr=-jo!|r!e-%i~!;p(prM*+8=XQ
ziuQcA%cJ{ajsVO8ih4bU;V@k5yN_q{DPI|jzdlC-P+G@{zE7F5KW0{+(!Ie%Y(Af8
zKh%bCHn8`hjhTE(H!$jtx0?8-YS?Fwi7loLru{W;YIJ+AMez%DhH-NV&A=)E0000<
KMNUMnLSTYH|6G9p

literal 0
HcmV?d00001

diff --git a/src/android/customCamera/res/drawable-hdpi/no_flash.png b/src/android/customCamera/res/drawable-hdpi/no_flash.png
new file mode 100644
index 0000000000000000000000000000000000000000..037c36ed4b031f9fe6772e59d80949377943d341
GIT binary patch
literal 2436
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
C-=|gp

literal 0
HcmV?d00001

diff --git a/src/android/customCamera/res/layout/activity_camera_view.xml b/src/android/customCamera/res/layout/activity_camera_view.xml
index 6d508c1..b0ed095 100644
--- a/src/android/customCamera/res/layout/activity_camera_view.xml
+++ b/src/android/customCamera/res/layout/activity_camera_view.xml
@@ -21,6 +21,24 @@
         android:alpha="0.2"
         android:scaleType="fitXY" />
 
+    <ImageButton
+        android:id="@+id/flash"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="30dp"
+        android:background="@android:color/transparent"
+        android:onClick="enableFlash"
+        android:src="@drawable/flash" />
+
+    <ImageButton
+        android:id="@+id/noFlash"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="30dp"
+        android:background="@android:color/transparent"
+        android:onClick="enableFlash"
+        android:src="@drawable/no_flash" />
+
     <LinearLayout
         android:id="@+id/beforePhoto"
         android:layout_width="match_parent"
diff --git a/src/android/customCamera/src/org/geneanet/customcamera/CameraActivity.java b/src/android/customCamera/src/org/geneanet/customcamera/CameraActivity.java
index dfd22d1..9ecb8f3 100644
--- a/src/android/customCamera/src/org/geneanet/customcamera/CameraActivity.java
+++ b/src/android/customCamera/src/org/geneanet/customcamera/CameraActivity.java
@@ -859,4 +859,59 @@ public class CameraActivity extends Activity {
     this.setResult(3);
     this.finish();
   }
+  
+  /**
+   * Allow to enable or disable the flash of the camera.
+   * @param view The current view.
+   */
+  public void enableFlash(View view) {
+    ImageButton flash = (ImageButton)findViewById(R.id.flash);
+    ImageButton noFlash = (ImageButton)findViewById(R.id.noFlash);
+    Camera.Parameters params = customCamera.getParameters();
+  
+    if (hasFlash()) {
+      if (params.getFlashMode().equals(Camera.Parameters.FLASH_MODE_ON)
+          || params.getFlashMode().equals(Camera.Parameters.FLASH_MODE_AUTO)
+          || params.getFlashMode().equals(Camera.Parameters.FLASH_MODE_RED_EYE)
+          || params.getFlashMode().equals(Camera.Parameters.FLASH_MODE_TORCH)) {
+        params.setFlashMode(Camera.Parameters.FLASH_MODE_OFF);
+        noFlash.setVisibility(View.VISIBLE);
+        flash.setVisibility(View.INVISIBLE);
+      } else if (params.getFlashMode().equals(Camera.Parameters.FLASH_MODE_OFF)) {
+        params.setFlashMode(Camera.Parameters.FLASH_MODE_ON);
+        noFlash.setVisibility(View.INVISIBLE);
+        flash.setVisibility(View.VISIBLE);
+      }
+      customCamera.setParameters(params);
+    } else {
+      flash.setVisibility(View.INVISIBLE);
+      noFlash.setVisibility(View.INVISIBLE);
+    }
+  }
+  
+  /**
+   * Check if camera has a flash feature.
+   * @return boolean.
+   */
+  public boolean hasFlash() {
+    if (customCamera == null) {
+      return false;
+    }
+
+    Camera.Parameters parameters = customCamera.getParameters();
+
+    if (parameters.getFlashMode() == null) {
+      return false;
+    }
+
+    List<String> supportedFlashModes = parameters.getSupportedFlashModes();
+    if (supportedFlashModes == null 
+        || supportedFlashModes.isEmpty()
+        || supportedFlashModes.size() == 1 
+        && supportedFlashModes.get(0).equals(Camera.Parameters.FLASH_MODE_OFF)) {
+      return false;
+    }
+
+    return true;
+  }
 }