From c3420aa74804a4f023562c72726d67a7991a57cb Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Sat, 9 Jul 2016 21:15:05 +0200
Subject: [PATCH] add a button to open the Camera, closes #4 - added it only to
 the main screen with the directories, as adding it in the specific album
 might be confusing. People could think that the photo will be saved in that
 album

---
 .../gallery/activities/MainActivity.java          |  12 +++++++++---
 .../{directories_menu.xml => directories_cab.xml} |   0
 app/src/main/res/menu/{menu.xml => menu_main.xml} |   5 +++++
 app/src/main/res/mipmap-hdpi/camera.png           | Bin 0 -> 364 bytes
 app/src/main/res/mipmap-mdpi/camera.png           | Bin 0 -> 240 bytes
 app/src/main/res/mipmap-xhdpi/camera.png          | Bin 0 -> 446 bytes
 app/src/main/res/mipmap-xxhdpi/camera.png         | Bin 0 -> 666 bytes
 app/src/main/res/mipmap-xxxhdpi/camera.png        | Bin 0 -> 894 bytes
 app/src/main/res/values/strings.xml               |   1 +
 9 files changed, 15 insertions(+), 3 deletions(-)
 rename app/src/main/res/menu/{directories_menu.xml => directories_cab.xml} (100%)
 rename app/src/main/res/menu/{menu.xml => menu_main.xml} (63%)
 create mode 100644 app/src/main/res/mipmap-hdpi/camera.png
 create mode 100644 app/src/main/res/mipmap-mdpi/camera.png
 create mode 100644 app/src/main/res/mipmap-xhdpi/camera.png
 create mode 100644 app/src/main/res/mipmap-xxhdpi/camera.png
 create mode 100644 app/src/main/res/mipmap-xxxhdpi/camera.png

diff --git a/app/src/main/java/com/simplemobiletools/gallery/activities/MainActivity.java b/app/src/main/java/com/simplemobiletools/gallery/activities/MainActivity.java
index d33e9446e..06062033c 100644
--- a/app/src/main/java/com/simplemobiletools/gallery/activities/MainActivity.java
+++ b/app/src/main/java/com/simplemobiletools/gallery/activities/MainActivity.java
@@ -90,17 +90,23 @@ public class MainActivity extends AppCompatActivity
         if (mIsThirdPartyIntent)
             return false;
 
-        getMenuInflater().inflate(R.menu.menu, menu);
+        getMenuInflater().inflate(R.menu.menu_main, menu);
         return true;
     }
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
-            case R.id.about:
+            case R.id.camera: {
+                final Intent intent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
+                startActivity(intent);
+                return true;
+            }
+            case R.id.about: {
                 final Intent intent = new Intent(getApplicationContext(), AboutActivity.class);
                 startActivity(intent);
                 return true;
+            }
             default:
                 return super.onOptionsItemSelected(item);
         }
@@ -473,7 +479,7 @@ public class MainActivity extends AppCompatActivity
     @Override
     public boolean onCreateActionMode(ActionMode mode, Menu menu) {
         final MenuInflater inflater = mode.getMenuInflater();
-        inflater.inflate(R.menu.directories_menu, menu);
+        inflater.inflate(R.menu.directories_cab, menu);
         mActionMode = mode;
         return true;
     }
diff --git a/app/src/main/res/menu/directories_menu.xml b/app/src/main/res/menu/directories_cab.xml
similarity index 100%
rename from app/src/main/res/menu/directories_menu.xml
rename to app/src/main/res/menu/directories_cab.xml
diff --git a/app/src/main/res/menu/menu.xml b/app/src/main/res/menu/menu_main.xml
similarity index 63%
rename from app/src/main/res/menu/menu.xml
rename to app/src/main/res/menu/menu_main.xml
index 0cce6d24e..d7f577285 100644
--- a/app/src/main/res/menu/menu.xml
+++ b/app/src/main/res/menu/menu_main.xml
@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
       xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item
+        android:id="@+id/camera"
+        android:icon="@mipmap/camera"
+        android:title="@string/open_camera"
+        app:showAsAction="ifRoom"/>
     <item
         android:id="@+id/about"
         android:title="@string/about"
diff --git a/app/src/main/res/mipmap-hdpi/camera.png b/app/src/main/res/mipmap-hdpi/camera.png
new file mode 100644
index 0000000000000000000000000000000000000000..497c88ca82b139d8523f62d272569b97777cdec7
GIT binary patch
literal 364
zcmV-y0h9iTP)<h;3K|Lk000e1NJLTq001Na001Ni1ONa4O9@aD0003qNkl<ZcmeH|
zJ!%3$7(lmCQzd1BKM};sq_D^lMD{BFpon`5aSsvLX3GRjN)O<UFi23#7x=2o;L6P8
zr%B#d%`0B<u`?U}LAYas&4yc|^HZX^;e~TNbL|tlBBP8aYL`Ma5;VT-NvN8kgisPQ
zqzOfvp>S{uX;NkkS)#&21u+#OWT?<*8xnfup2(UyYu`|TWayHRle3^B=LUseC>Hz3
z2?03L6F2Y)Y1vJelVK0EWmn2Ql$Ly?Q}HYJ&`ey8O(uTi9vWT@jom{_aSLoF;#2pK
zl4W-|8up!*EPLl3g1*=uhfkRYaWVLWw$#P9nUaw)p(W=g$}a?K8bsDKc?-L=1LM-h
zsPJb*v0}uSlpQ7f(8IPT6#ZR~|J)2!gMLSvx$!&t+WdOxKlA~ZoD~H=l;~Ih0000<
KMNUMnLSTYiKb+YB

literal 0
HcmV?d00001

diff --git a/app/src/main/res/mipmap-mdpi/camera.png b/app/src/main/res/mipmap-mdpi/camera.png
new file mode 100644
index 0000000000000000000000000000000000000000..e830522008b0a1b1f39fdde1156ff1bae3f955e5
GIT binary patch
literal 240
zcmV<M01y9(P)<h;3K|Lk000e1NJLTq000;O000;W1ONa4N`Cco0002DNkl<Zcmd7Q
z&q)JO6vol}T!mC24<sofe=3k*2Z9|46D%r(kS>HkAXPXi!ebT=lL4K1x)6Wg_MY91
zzt7rrmFO;X_oUmq$FIPH+E8b!7Su|rTTt3JU}I)<+1$1SJPXOxL=vhYuo3Q@z)==<
z{b1(CNz*~H=m#TH*Ja}&F!>pnOOBdeCCh%W6|%$U`K_?;2UJ3mWl4Bp2(Ys-zHDi)
q+wWiFtfaRVtkebP_bn*je*_=o)*|^)1w=Uj0000<MNUMnLSTaY=43_y

literal 0
HcmV?d00001

diff --git a/app/src/main/res/mipmap-xhdpi/camera.png b/app/src/main/res/mipmap-xhdpi/camera.png
new file mode 100644
index 0000000000000000000000000000000000000000..be9fb226a53ce5ee4008cfafa0754f42284d51b3
GIT binary patch
literal 446
zcmV;v0YUzWP)<h;3K|Lk000e1NJLTq001xm001xu1ONa4{R=S+0004nNkl<ZcmeH}
zOKQSE9EYtU-a#ekrev=hrO*?Uf{zwKq3#MoyYd9xxalE8Q7VX!^Atf3P(-Cw`uG~c
zkSvlkB{PD8zyC(^P3D7toJZ)CV+c*W(j??pz5}S^ogeOG1=oD>S3bFt5nS?tU*5U+
zuRv$a3fXL!qPq!nmZ-`S-6<HOG83m@h03g*0>wEv!Im}!G@?dn#;*=rm4ZHT$3Hy5
zK#ky=d(UOmFsQV^o<2gJx=}eIwnA3W7xau83lN!8vECcV2)4w<^v@2~67MD11sAjh
ztGUt}LA${P1=0J3E1eNGc`3L+Gf5t=WKEt5E{OV^X;qWQ4p$&rl*20-lc(iB^4yia
zijQ0lF6anWaiv8;dol|xA!y6No&?ck78<-*{Fa&B9E#TSq3mYYuttQ*QZ*_=*n0M$
zV!JjJ9`z`_U5gAzIwsc`sys4xbSaS{W>lIoJ$6TM=qna%_I>f1qB5iXUVh&=cfY<*
oSSx7G$evyZ)YnOH5*(G_7e~OF#v^w+0000007*qoM6N<$g3E)#tN;K2

literal 0
HcmV?d00001

diff --git a/app/src/main/res/mipmap-xxhdpi/camera.png b/app/src/main/res/mipmap-xxhdpi/camera.png
new file mode 100644
index 0000000000000000000000000000000000000000..c8e69dcebb98d43695027fcc7e39a339c84dda51
GIT binary patch
literal 666
zcmV;L0%iS)P)<h;3K|Lk000e1NJLTq002k;002k`1ONa4|Kxkj0007ENkl<ZcmeI1
z%}N_l7=~wIXRuo{3D!+%m97e122!dkU6n#Xx@}hlV-gpdjie%8fg3MD$iju97vT>y
zDuP#FBS9M!QcYr?x(Xj5^OKhEOrZ0;%Xt?M^PS1$oUvkJVg?bG2*VOq|FP&lUkJx<
zKARBwK%20%c&{z=j$iacgSVPOZ>ZBRKY6Vs^pYxn!v)X(MaU+{KDTId#}NxSK|*6x
zFv$sHenK`COmmFwEtDe)3f@BdM8ToA&@EBW@D_@SSjd>rJ=<hS<6>jul4hPAn$ZYd
zQ(^?GM-r@1H!ZY@i{+CPWphGpzG8()mbM9@HXpG<W|p?TQ1{(&n4!eRV@gb8cU_&+
z7TQGipYn|>BsG>9Ms~`YLf6Qp{EBmWamEC4dDr!XN=Tg=UR*LRnyXqu_l$^Po#V$T
zj`&?_>IiL%W{Dt*qP?plloe0b6+u)P>h$wELg`L#hA>QZ`WYP|H+WzkLrdxi*`3}7
zVOSR<9(<vQN2a}~rwPNP_M)B_8_F6%{1A_QK}TpuG?xitQMC88ULA=}bC@&ysE9|v
zrKKYTE22BWC0<<cLNwPvOQ=ptw8uI1xI0p3lp8%ED9b($MXFs(c@bN7*a96P`HGc!
z!W2c;A5&zKp{}cW6Myn&u|nn(4`#MObD?zdJeb=kmPz@_jIw2VD_v)mL{Ax)HEyCg
zY-qAeo(xGG9Fk-xut)1ZK8}fn?gs79^N1)o@D^Gi3Ub~;4kwuAJGTGFmt(^^&w@Tr
zITSdgfi?{e$YEo73q_w;C>Dx^Vxd?l7V1BL0REY1s|}3R@&Et;07*qoM6N<$f_%9k
Avj6}9

literal 0
HcmV?d00001

diff --git a/app/src/main/res/mipmap-xxxhdpi/camera.png b/app/src/main/res/mipmap-xxxhdpi/camera.png
new file mode 100644
index 0000000000000000000000000000000000000000..777658e95515ca47c9852d00621e2e6d45abc5c7
GIT binary patch
literal 894
zcmV-^1A+XBP)<h;3K|Lk000e1NJLTq003YB003YJ1ONa4NRhv@0009;Nkl<ZcmeI2
zPe>zI9LJx5Cecy~F=}h8lwKtS@9n)MRxm2`AkqpItJs@p>)C(tu-V-#=CId=UD(s^
z#Zy@d`v;fOn~Tzu?OJHHNtIePI-lk`KN@Bx3G-g)`+Uz|m=FBkykXu`7K_DVu`~_~
z1Z4r$j3}CsFA0vr7p4ddb45K=_{;=>kNJmsIpZVU0%^)LLWz`4fe-nOMmgjIT>|g$
zGtFS1ZXE(|^ApYDN8W0_z#v8Txj;7;?6E~Um_R#sF$;$xalZoX{D6r(A?{D$E~c{O
zM_>?haY%a$6fv1Q-U9oW%qwq!3ryzRTflV87q9|W;F{;GFv0){qSYiAAj>K*xHezl
zfJJ&yHS#`7{A#YiA58NG$|F%`I5JV-9to7sbaLM;flIzZ1<cn}OcD5-Pf>Lw!<h*J
zmwbY%GecCg3)C2%HyPz7+w4@cO`a?rsQ<{UZh?C!8Q$d<r$|o8(}P0hflh(nNr-kE
zQ=CwXGLtBgB**#$rbRbG0Wb1IL~Bl$z=7Dd+9=?M8z@&|yw)SID4J9FWkNK+(;;w8
zuUNV#_~lQ!T-`pL@CBZW-YtT#DcU>X3#^Fu{wYByi=R|$;R}qoTB8JI$kiVUUtqx1
zx=B!Su6`<X0kMT`6O_kdI}2SP8gvl~o{7Dn<piEefmR!#M`DCDFXDXbE#j=Jl_e+{
zSARTwfmK(lBj83>5*yii_yR9b4GhtSXus6)G54OU*Fzb<9Fuf)`*nQG!IEfB;+M}w
za~X69{6e&@G0KTnj6*#FFeADVZuofoh-l4&E`cLDWuFO3wP#-rPc_|?^a;Rylnh;L
z@)wd48zfOOJOnKQa*Rac43Xn8&v?osa%9ANUyhGPfeM+%FRSSkfU`OkhV}j2l~kBT
z1<X8GW*u-mAc^vsZXTL=#B|IYF_cGQd_&3HL%!F1OCPF6`dQ|%6^>bVSYwP7Nn+I`
zNiohkFLCTaw-vAgjq*RZ@U(}??0O4qVKTS91=2W}ibKjn!0?Ng1(Y9wI8QK<?}^nG
zkP1b^2Fam7EZFt?G<SH#Il4J#m)m0Yg+MFD3N#)oU<Isz6|e$UzzSFaD_{lw1?nA)
Utzo|&XaE2J07*qoM6N<$f<U^CY5)KL

literal 0
HcmV?d00001

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c594be14d..eb4e5a0a1 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -18,6 +18,7 @@
     <string name="extension">Extension</string>
     <string name="file_deleted">File deleted</string>
     <string name="setting_wallpaper">Setting wallpaper</string>
+    <string name="open_camera">Open camera</string>
 
     <plurals name="folders_deleted">
         <item quantity="one">1 folder deleted</item>