From b0280b6a4d11603b40387c303b0da7e48b692404 Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Sat, 30 May 2015 09:07:36 +0100 Subject: [PATCH] cleanups --- app/app.iml | 8 ++++---- app/build.gradle | 8 ++++---- .../fragments/NavigationDrawerFragment.java | 6 ++++++ app/src/main/res/drawable-hdpi/ic_arrow_back.png | Bin 425 -> 0 bytes app/src/main/res/drawable-mdpi/ic_arrow_back.png | Bin 336 -> 0 bytes app/src/main/res/drawable-mdpi/ic_refresh.png | Bin 644 -> 0 bytes .../main/res/drawable-xhdpi/ic_arrow_back.png | Bin 532 -> 0 bytes app/src/main/res/drawable-xhdpi/ic_refresh.png | Bin 1161 -> 0 bytes .../main/res/drawable-xxhdpi/ic_arrow_back.png | Bin 721 -> 0 bytes app/src/main/res/drawable-xxhdpi/ic_refresh.png | Bin 1721 -> 0 bytes app/src/main/res/drawable-xxhdpi/ic_search.png | Bin 1695 -> 0 bytes 11 files changed, 14 insertions(+), 8 deletions(-) delete mode 100644 app/src/main/res/drawable-hdpi/ic_arrow_back.png delete mode 100644 app/src/main/res/drawable-mdpi/ic_arrow_back.png delete mode 100644 app/src/main/res/drawable-mdpi/ic_refresh.png delete mode 100644 app/src/main/res/drawable-xhdpi/ic_arrow_back.png delete mode 100644 app/src/main/res/drawable-xhdpi/ic_refresh.png delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_arrow_back.png delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_refresh.png delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_search.png diff --git a/app/app.iml b/app/app.iml index e153ea9..81a46eb 100644 --- a/app/app.iml +++ b/app/app.iml @@ -84,11 +84,11 @@ - + - - - + + + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 56aa0b8..4a611f9 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -3,13 +3,13 @@ apply plugin: 'com.android.application' project.archivesBaseName = 'OpenLP' android { - compileSdkVersion 21 + compileSdkVersion 22 buildToolsVersion "21.1.2" defaultConfig { applicationId "org.openlp.android2" minSdkVersion 15 - targetSdkVersion 21 + targetSdkVersion 22 versionCode 2 versionName "2.0" } @@ -28,7 +28,7 @@ android { dependencies { compile fileTree(include: ['*.jar'], dir: 'libs') - compile 'com.android.support:appcompat-v7:21.0.3' - compile 'com.android.support:support-v4:21.0.3' + compile 'com.android.support:appcompat-v7:22.2.0' + compile 'com.android.support:support-v4:22.2.0' compile 'com.loopj.android:android-async-http:1.4.6' } diff --git a/app/src/main/java/org/openlp/android2/fragments/NavigationDrawerFragment.java b/app/src/main/java/org/openlp/android2/fragments/NavigationDrawerFragment.java index f4282cb..6024cf6 100644 --- a/app/src/main/java/org/openlp/android2/fragments/NavigationDrawerFragment.java +++ b/app/src/main/java/org/openlp/android2/fragments/NavigationDrawerFragment.java @@ -20,6 +20,7 @@ package org.openlp.android2.fragments; import android.graphics.Color; import android.graphics.drawable.ColorDrawable; +import android.os.Build; import android.support.v7.app.ActionBarActivity; import android.app.Activity; import android.support.v7.app.ActionBar; @@ -188,6 +189,11 @@ public class NavigationDrawerFragment extends Fragment { actionBar.setHomeButtonEnabled(true); // OpenLP Blue actionBar.setBackgroundDrawable(new ColorDrawable(Color.parseColor("#4d7bd8"))); + getActionBar().setDisplayHomeAsUpEnabled(true); // also required + if (Build.VERSION.SDK_INT >= 18) { + getActionBar().setHomeAsUpIndicator( + getResources().getDrawable(R.drawable.ic_menu_white)); + } // ActionBarDrawerToggle ties together the the proper interactions // between the navigation drawer and the action bar app icon. diff --git a/app/src/main/res/drawable-hdpi/ic_arrow_back.png b/app/src/main/res/drawable-hdpi/ic_arrow_back.png deleted file mode 100644 index 06104d817f5155930000f2b7d23b97f2ba74b18f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 425 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY0wn)GsXhaw6p}rHd>I(3)EF2VS{N990fib~ zFff!FFfhDIU|_JC!N4G1FlSew4N!t9$=lt9;eUJonf*W>XMsm#F#`j)FbFd;%$g&? zz`&^J>EalYaqsPo)4Yca1XwP3dUmi)T4doQw7_Q)cZdUX0Yf8?$H(+*yPdL6rrZDA zJui(pdTrr^W|=1n?3NzvCN{eTFEq#pM1ZNE%nBuS zwveftc~+f?WU4J%p}f3V#Zpos@|=Cc8Qqx&eRDtDklrJ~YbVPle?5K)=i0QNffGZ5 z4s}g9)m6h7^wK=TseQAW$DAWSyn;RFY-sdII%;Sf#n&kwG123UN59jfws|Z<)?)KE zUg~Mx?-?yqny#Vpw&22DXT_Dr@~ diff --git a/app/src/main/res/drawable-mdpi/ic_arrow_back.png b/app/src/main/res/drawable-mdpi/ic_arrow_back.png deleted file mode 100644 index acb9af9557ef2e4273699db1d4c3bec9413438a8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 336 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}a}tg=CK)Uj~LMH3o);76yi2K%s^g z3=E|}g|8AA7_4S6Fo+k-*%fF5lweBoc6VX;-`;;_Kaj^+;1OBOz`!jG!i)^F=12eq zPk6dGhD02Gd)=C=IY6NGp>j(8x)Tmk@=G{V5)VH0_?0oSf#afex}3nFm<@mTJMA$J z<4y9P>cI4${mXoHju#ghB_x^{?^QDFc<_vW%}-8Kw|s}0)0tlF;W2ok+MpTF*7H*+ z;ha1(-%sTOs{8pZo_=T8{--?Q?CLJn1JnMqCU~Ezn0TPG`lSDr3YQ)qbEi)WXL8&O zO;lJieeSFY@z=eYBrUX>q-Sz9$^J4qxL#LfVdNeSr|nkr3j1T~qGOb=f0uOr_fTa5 bL%G=BtC@;nyT6G6{lwtu>gTe~DWM4f!2Njs diff --git a/app/src/main/res/drawable-mdpi/ic_refresh.png b/app/src/main/res/drawable-mdpi/ic_refresh.png deleted file mode 100644 index 7891efffa64deb1140c0c039b32bf4a0493bf96c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 644 zcmV-~0(004R> z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN zS#tmY3ljhU3ljkVnw%H_00I0-L_t(o!|j(%Pg6k@hD-Udlp=8_LI|lPVMY8Apc|IZ z2yxLr@vJRh(gF(-7R3r1q6-sO{0Ipo8Ut&wd`bz#g#^<|a@owC+=gLh?$s_JH)qqP z?|Glj?Kx*oBSh*Okq{69?hBxuG2XGo8C9-0=L@Th^H8D8`Umu}$|a5>E?FT}qn*I< z2WVx1ze;mAs>~4+>PZ}bfD}7gb2qk05@AZbvj#k)>@oSy41;viLL-kEBF};6(=tW* z+7giR*zYnz^oF8|3_lg;u>!QREfdy=-+IbNtOo<+r95Y-u_)jC15#Aww>K5>RFD%C z<+G3bwzmKzxDe7&gZ-qkXpMlhEX=6Ze&Uv{FaiofI1|X;0`OS~2Q~ItOEl8Q)pZ(-lSC!zjBx9wguD;s~_Xul-2uk9DFnCG7QKti*S zeU!Q_n*D5cNjZ}o_IRnNs779~FEvN1$D?0c20RFd5;>mJ%>$b0;stq+xx+F2L3Y#R zjSF2JU+D?D{Km-11wb7YruAddT!v36%GRrm-xTQmKkIvfG|OyIrb3ldHYqTwsjl!Z eR0s$GHE|8G+Mu|4IRdW$0000I(3)EF2VS{N990fib~ zFff!FFfhDIU|_JC!N4G1FlSew4N!t9$=lt9;eUJonf*W>XMsm#F#`j)FbFd;%$g&? zz`)q!>EaktaqI0ZUoU1yiI#_473Lo$s@io-JFEDMB@QybytN}hV58vj<*$Boni~B6 z-YB_j`S05~7k}T9NN8YWgA<{Qzt`{9Oz4+wXr8oyrRJHl_XWm%pO>~-Okr=p~gd&`R7bRpJp~psgYCAoX_fU`Zuf4(+6 z`Lng*%b(H)rk~jis-K=Sx_(M$O#Sqnq4iTb!_rUFnY*6qvrai3&!#bBKTCko|Njkz zbsmb$6Q=t!raTj7*!h!f&Ozl8HvNzBE#-5LG;qIdf5SSx;_U}TZSMq~XF;5Eo|Y&z zes!Mg_TX=jn&1rkubM3Hws|o%?%gQr_aI-FO;}|1?u9I8zf~zXmL3pvyC7@GDmbOR zMv>*MVK#$f?FC)+7w)`AS~?Q>H5JqDxOsF)RZJ3m|O1-)T7+DOS Lu6{1-oD!M<=ZMbk diff --git a/app/src/main/res/drawable-xhdpi/ic_refresh.png b/app/src/main/res/drawable-xhdpi/ic_refresh.png deleted file mode 100644 index e44a6d2823f87827cc85b22153932381831463fc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1161 zcmV;41a|w0P)004R> z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN zS#tmY3ljhU3ljkVnw%H_00aR^L_t(|+U=TMXjDfShIcnHAu)+*DphC^Y5H?jEk+_m zysAIsB1E+9m8Au5yy#jJc}O8xO@fI{r6nO2QE6z6KZRnT(n2o^S}F#i*n*)+f8s?* zH0DRsYQSKO7jdi3%x-qi`Od@x!*{prdFOq0=giFc&Kn^T?us}72jBo4fCF#<4!{98 z00-azo*sZ@yhAfxTxN(#rkQ4vAuiKJ6L0f;hHCrl0Yq6xD}OUHNA>X;Z=`L1#ty(U z)bh`q)}O?vp=b`(dS+|@l<*0+Gcup32^vyB)Ia=Ipa3!AjC(Sls2gl2YEW+Y{~G}U zyh^t(^NBjg@}%|y1bB}-BKBt|(_2aG2LzBso0$1T?SD9x8kNrj0LY~)rIjI05N9K$ zl#oLfg_QCpyEx5o%IiAG*6arWki!p2EsW4gS<1a)ErGgjYJ`)CraVE*&1H{Qo zOQV=NZl*o8gaJM`4sw?!@-xzTmLuG^5Ad#Wh+bBBS_;-PWEbFN+}rxd}sRr>+}>VbD-*qXcj3P5St0MyP~ zN!S3?_Ek>U0R9a-z+l*?P;c08;$IYiO<@E0Qurus9pEDc;AGeUDiwfhVFM^;T0vMH zw)e!pDgbSP**U6=bY2FaS&<#}{YY=FMOyE5w+z5*+7b7|Kmh8raY|(XBK)QZ53*3) zzTUh%FLe(@*s1+C2gCvN*M{5V0P-18#HUy(YJaV^)(xb0Z1g@q`vjW1kFpke(&7Wz zxJ?n)wIR+3wAW|fI{&C?UnN&MFSO0@zWu8zkeZ{4uk61U=mx) zjc<3mDD<&)eQ!`4W=T+yv(3iN&7ZvP$^L5oGN|3BBFN0#0VBc`Eg5cYg|u+bs8t(m z=r77wNh2OLX`Yb^s7@ODI2L?rF`Ms_wgE?Jr`(vpO5m5%o+9Jbnfa37ZRI$gvYR=~ zH|(NLANjZZt}Zc;M+{+rihZ+!8ZC&X)N|?!L&+BKCjc zh53peM|qzczRX`w@6a4%@U@t|jCnFYMxBpcTr_%IKn+(iGJl1*fAewxv$cwY{61%p ztcPaG?Y31itHo?#51m}1pAqgd#W(|WbBabPd2T-XLQi!$00-az9DoCG01m(bH~Usni diff --git a/app/src/main/res/drawable-xxhdpi/ic_arrow_back.png b/app/src/main/res/drawable-xxhdpi/ic_arrow_back.png deleted file mode 100644 index 7772e50700f83413243ffc66d988d11813c891d5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 721 zcmeAS@N?(olHy`uVBq!ia0vp^6F``Q1xWh(YZ(J6g=CK)Uj~LMH3o);76yi2K%s^g z3=E|P3=FRl7#OT(FffQ0%-I!a1C(G&@^*J&_}|`tWO>_%)r1c48n{Iv*t(u zRd{;3IEGZ*dVAN~kJ*u@CDHv+luS1(w+EAsMZ~(+1V$mJ37kQ@-fDf%&*YonKe=*i z?B3nnS*yz!7+C}yAVeU7Edmu{G}*@&&+d?3@lCKWL@9{r*Aq@%CD{e}a+*q_3+CH6 zxkx$euT1F>Y54a{P;nKz)p=#d5Z*0kg#`CTRMLP0;n{n_%eAHo^3KjY9Ffn-1S> ziW{XqoMFj2Xw1KY^SsUiGn?WDsgGwEvW^?JeZKZ&O^R(@K-xbu?=A-x?c6k5{7uKF+wo^Qw4_$7>Bx%u(9^MMmPKyIt6L4e9a_>Sbvv@$1$jDFwMRbb ze06-`kxmh|S4%og+>BZ~L)xlRJ4=ooa_yYb#H!M{WsxRJ=aoagPddIlDm>C5!aQwB zhl%p8mW~kTdnp|y$xN;tQ<~LOJGLzLV(qwcIPY|4hqoB}E|)ETB)9l(`D2-)NMg*`vK$g|nhzkKWbCEGhwDoo7nt&SAF-TpIoQMsy|SpqYMLIVR6h*$)nKx_@D e5K~6)F9!a?Z;1~czjXzsGzL#sKbLh*2~7aTlMM*~ diff --git a/app/src/main/res/drawable-xxhdpi/ic_refresh.png b/app/src/main/res/drawable-xxhdpi/ic_refresh.png deleted file mode 100644 index edca523a0e7163b65134e5ea6542234754a30ee8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1721 zcmYk7dpr|*AIE<#Crnd^$+b0?vXIQ2Be$NB%Z7Ht=?Han!iv-y#h5edA)-xkZ5t{k zw4S--oFt^I!`wYCJJE5OYs-@nhn&vN>v_F;p4aR1{eC|0@Av!vH-m`xhC&P>001Zs z>p@mH`|na$RrKQoOSHleKVr$p0iYiMfO#E&O~r^g4?vtP0E<5W;8X~J-X+dcl8a)Y ze8$(?1AIFd>vrwP(fnGlMH0xjLgZj<8O;xN$VT0OG zo$kITevJI1NH!JWJeR;rESclbrbWwdmt5zPKf260&Ry-1qrLpx_1qB{W%DmG z`H~dj|G-g1gx^bpCcSpU4|+L=#`fcl_~*iQJtiL4xOOa>8kY=o>k4HYgw#qv%{pW~ zHM={WEKtdw{Hl0i1viLx8te5*n|nEJOXP?)%zcaB_qV~}WrW{9j(pl$=BoOT+aGey zJrz;&`yDjlYAKM)Sw4|!_rcXSLv4ntRViL4azc$G=mzfu;LHI zg>+LnwW_NK885U+?36b1X5jmYu78vYk9OQ>&eD{fXA~~4XjHPz;M~o-Ref?5Be@#o zu6M!naCdY08bq?9G*4w|F~qH}hZCnA7o3Pf(R>}(~w&tAZ!!$B{XPP{V6S zmTda`Sk)GEUg4GDXai&$Nj92$i7i6*`AaNDFct|rmDi+M5fkV(68svb%br_#IbVe6 zLv`OXrSndX6d2Zh<2yjrlIyET%HOp*@e_6`=^m`Jdt_p6e{Tk*S|2j@$x@^k%KQ)b z-!zp5>AdJkS1NVuG^%M!fSY0DdD(BwTJsiiKkvhAO{CY(IBz2Icq3O0gK`szzNk z3_{G(-_AQY5~TcqAZfA0EQ~$?n{Lbj6rrexGy9T7UVr>@XCFp7EDy#5M%Day$(XTK zw?H#7FI_K2*h6btVFH{|#zm-VQLVs7*vWJLlrtYkk=Sql61RdTKzu?=Tr!mMh* zg4VBhiqtHBudj91E241bl%$5JS0^GO2a*M4I%UHG`7M&f6d!(tIhFKiVJH%&KaCrx zS-|BkG>onlmbp@D+h1$Op&%RBVCRdOu86oar`)t`9&(aIL5R%#1mjjy4y%vy#Wrpx@=Zt%Vb!N=ZHnW;6JBvZu1v7~>Y&K(0cf}Ngx9t45A=h?m89l>}bmJ_t zsZ-D9gE}7`%o@pTUwD7v(_%t=ZN`VP4}L>Ohtc;5$X_1*CqJVg>CW`YeeRxb&wLv- zD;}v!zdF{1tKPAswJ-hBVWKZ}_(E1h^GXuA*De$teLxl{9F5d?bY&uf-fBSRjJ*pu z&>r*Vg>_?7b(z`9=^2^z-NJUzyZkJ}d#uJKZz%X^m5cZ-?Bo5bDJ*iRYxS{xXRUh4 zZ7?r1Q9j-4dT@NjHUq`*gAxZ0zuU-Z3LQPNIuY*}{ZGC$ja=TN z{0h5LLFHwy(!!U95++#BF#OL2`_@Esx(zdi1NIt67FSwaKx_4~r-`}MS zpl(NQxcFA!iz|N(dw5q5Q#5FDbMytZWR2f+#LJZ+adbGdZr!`PLYV4ww6rLfGiS<; z?e9sz_ls>7zsG0f(CN37w+Xwb5cYMT!TzG_yVd^(0QX;T)cXul=v6n>%Cij>9|hn% L@g4&AA5#AU5PKfm diff --git a/app/src/main/res/drawable-xxhdpi/ic_search.png b/app/src/main/res/drawable-xxhdpi/ic_search.png deleted file mode 100644 index d8ffedc09a965598cba6b306e89b98f5d2bb816a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1695 zcmV;Q24MM#P)004R> z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN zS#tmY3ljhU3ljkVnw%H_00tLHL_t(|+U?zMNL6PX2k_%H|Genmu5PfknATt*G-@k) z6)J`agT@H6C}#E#U#u;yul?O}gNQ&Ob4Xea)`}YRZm&d8nv1PJptG5T?7b)jqcoj* z&t5b^)ZcTSd(U~E^PF>j{NCRCJiq%n=ic-DzZNVGQ7{1mF%SbW5Cbs~12GT>12GT- zF%SbW5Cbs~hgP6CwxJH~=)xdIF@YJ(;1xzNh%U4PD8(Dm1j;}eF5?LjupJ_S0W_f$ z8PNgSjH`I=2s1yPp%t6L4wR1Fc$hTJ+<1Tr#KH-bhFy5-3THM3Q64^^jrhY8oZ0vd z8^QyWjRs76%45UE6fPnw3_$Dfm*+UM@h1v`4zvg3%6M$pc!`SO0;S=+Qk>bS4<=9y zKWO2xVWZ8jN531Mo7#A6*tqTwQR-hV`MW29UR=T<6e16CWFixBVoFd`kEuYrgm=$gPgAQD-bFi11WFeUht+zXT%Dk{ z0bT9tWL~^m_|vQ+y`Kd&mYWCkNbq1^swBPTf`|Tn(||S$uI3hH2^I-z{m3k!tAbXu z$`t7_gBFv3GRS$Z3B0W|#dpa*+9;No161bYb!;Q+E-?q_GTHjcSDxfrvPINr4$u=K z#V#$+lDkCh{iXorkk@dZ7N7$}?K4)@mW z)J~*#NgGfzIUQsKP#2NjA#Fg_L0-2CVTZp0F4sq^FSwsfY3={~USH^zD#?1g4;U8&!%qwXq9`?PV*kN{8qsjNK zMynY>AQuwo0-_d7)R+NON)C7AXd3SDZO~QjWpQ#mrb-LYLGl8vFlESffJm`h3(&9r zjYrA8u!+2eYm_JXK6(E(m;+Qw{t8@Cp5!&M?jn;W4xf<|hpUvPxElWwHIJAyacH5H zypBI9P4O04Z?jo*^P2?A2-I~sN(8ljXxj3Z2V|;4Sf(Vs75H1Q;m)}AK^20lc}q!p zcLX(lY93IG?A6<_0nd{=C8(_zY32c0C>Ji`{M^&j_6yfaf1;}wnCu(w36}v^dX`v~ za6NXXE}rCpHVD@*Cs3#S%VlE%AD9bd;iAJvf!kQ_^2v3_p@!4?cv1n%LchZY7;@1C zC=oo^U&rrAHyg-80bV+8Te_J-2V}M5HWnMt@t#heR5#RBNNjzZL>ty7(PO_x_POTH zf|cpzNqtLZz2uh6yEuS19YzZeqDOK|rsln3Zh%BTiwVy4G#s3*$Spfh@!XLm;6ca$CST4Gal#5weYMO$V~D6EBqV{DbYt zMu%TSUKCP*K4m-)|8FW}`*rk*SF3j}2>WQM#U$$Ij5_;tI*fNktw)ciJl*q-5b)^$ z9dC=I5Oa@ zLKp4Tu@$vwLnj6>j4@1O8siwo06Nf$ z8k8ilLgS1C(bqu(@;0;+1r5l;X$hjUQ3jGDIum6etwg~Da+( z1ktG|18E@&Hjo_A$tVL^IH8s(_&{<*C!!1_KJCmUQ8<9)i0YyYq>Ly$K=h_9S1T#Q z1f+y0TtF6%OAsB8GLYv);RBK(`Xbsu7LIwv6W+h@JLU~fnE&Ijc2S-q(SFQ35gkds zlrRI$C;BqlU5&+~#vM--{%7?y(O1zP?hwaO9F6vXnbKea24WxvVju=$AO>O}4hCW% p24WxvVju=$APxp%AO_ME{{e-e{L(dCk3j$c002ovPDHLkV1f=k;aUIy