From bca976191d1070ca70044496a4aafa1fadb4680f Mon Sep 17 00:00:00 2001 From: Steven Schoen Date: Sun, 22 May 2016 11:12:21 -0400 Subject: [PATCH] Fix Cast notification having no buttons, fix miscolored items --- app/build.gradle | 4 +- .../putionew/PutioApplication.java | 2 + .../putionew/fragments/FileDetails.java | 23 ++-- .../drawable-hdpi/ic_action_close_black.png | Bin 373 -> 0 bytes .../drawable-hdpi/ic_action_copy_black.png | Bin 352 -> 0 bytes .../ic_action_createfolder_black.png | Bin 495 -> 0 bytes .../drawable-hdpi/ic_filedetails_close.png | Bin 1565 -> 0 bytes .../drawable-mdpi/ic_action_close_black.png | Bin 291 -> 0 bytes .../drawable-mdpi/ic_action_copy_black.png | Bin 339 -> 0 bytes .../ic_action_createfolder_black.png | Bin 341 -> 0 bytes .../drawable-mdpi/ic_filedetails_close.png | Bin 925 -> 0 bytes .../drawable-xhdpi/ic_action_close_black.png | Bin 537 -> 0 bytes .../drawable-xhdpi/ic_action_copy_black.png | Bin 529 -> 0 bytes .../ic_action_createfolder_black.png | Bin 598 -> 0 bytes .../drawable-xhdpi/ic_filedetails_close.png | Bin 2356 -> 0 bytes .../drawable-xxhdpi/ic_action_close_black.png | Bin 721 -> 0 bytes .../drawable-xxhdpi/ic_action_copy_black.png | Bin 930 -> 0 bytes .../ic_action_createfolder_black.png | Bin 991 -> 0 bytes .../drawable-xxhdpi/ic_filedetails_close.png | Bin 3792 -> 0 bytes app/src/main/res/drawable/ic_action_copy.xml | 9 ++ .../res/drawable/ic_action_create_folder.xml | 9 ++ .../drawable/ic_toolbar_nav_close_black.xml | 9 ++ .../drawable/ic_toolbar_nav_close_white.xml | 9 ++ .../main/res/layout-h400dp/filedetails.xml | 76 +++++++------- app/src/main/res/layout/filedetails.xml | 98 +++++++++--------- .../main/res/layout/filedetails_toolbar.xml | 38 +++---- .../main/res/menu/context_files_multiple.xml | 2 +- .../main/res/menu/context_files_single.xml | 2 +- app/src/main/res/menu/menu_files.xml | 28 ++--- .../main/res/menu/menu_transfersdialog.xml | 14 +-- 30 files changed, 176 insertions(+), 147 deletions(-) delete mode 100644 app/src/main/res/drawable-hdpi/ic_action_close_black.png delete mode 100644 app/src/main/res/drawable-hdpi/ic_action_copy_black.png delete mode 100644 app/src/main/res/drawable-hdpi/ic_action_createfolder_black.png delete mode 100644 app/src/main/res/drawable-hdpi/ic_filedetails_close.png delete mode 100644 app/src/main/res/drawable-mdpi/ic_action_close_black.png delete mode 100644 app/src/main/res/drawable-mdpi/ic_action_copy_black.png delete mode 100644 app/src/main/res/drawable-mdpi/ic_action_createfolder_black.png delete mode 100644 app/src/main/res/drawable-mdpi/ic_filedetails_close.png delete mode 100644 app/src/main/res/drawable-xhdpi/ic_action_close_black.png delete mode 100644 app/src/main/res/drawable-xhdpi/ic_action_copy_black.png delete mode 100644 app/src/main/res/drawable-xhdpi/ic_action_createfolder_black.png delete mode 100644 app/src/main/res/drawable-xhdpi/ic_filedetails_close.png delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_action_close_black.png delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_action_copy_black.png delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_action_createfolder_black.png delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_filedetails_close.png create mode 100644 app/src/main/res/drawable/ic_action_copy.xml create mode 100644 app/src/main/res/drawable/ic_action_create_folder.xml create mode 100644 app/src/main/res/drawable/ic_toolbar_nav_close_black.xml create mode 100644 app/src/main/res/drawable/ic_toolbar_nav_close_white.xml diff --git a/app/build.gradle b/app/build.gradle index 3d4d6876..0422da75 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -6,8 +6,8 @@ android { defaultConfig { minSdkVersion 14 targetSdkVersion 23 - versionCode 96 - versionName '3.1.6' + versionCode 97 + versionName '3.1.7' } compileOptions { sourceCompatibility JavaVersion.VERSION_1_7 diff --git a/app/src/main/java/com/stevenschoen/putionew/PutioApplication.java b/app/src/main/java/com/stevenschoen/putionew/PutioApplication.java index 3b859e15..d6621951 100644 --- a/app/src/main/java/com/stevenschoen/putionew/PutioApplication.java +++ b/app/src/main/java/com/stevenschoen/putionew/PutioApplication.java @@ -54,6 +54,8 @@ public PutioUtils getPutioUtils() { public void buildVideoCastManager() { CastConfiguration.Builder castConfigBuilder = new CastConfiguration.Builder(PutioUtils.CAST_APPLICATION_ID) .enableNotification() + .addNotificationAction(CastConfiguration.NOTIFICATION_ACTION_PLAY_PAUSE, true) + .addNotificationAction(CastConfiguration.NOTIFICATION_ACTION_DISCONNECT, false) .enableLockScreen(); if (BuildConfig.DEBUG) castConfigBuilder.enableDebug(); diff --git a/app/src/main/java/com/stevenschoen/putionew/fragments/FileDetails.java b/app/src/main/java/com/stevenschoen/putionew/fragments/FileDetails.java index 354e13d9..7a1f88ca 100644 --- a/app/src/main/java/com/stevenschoen/putionew/fragments/FileDetails.java +++ b/app/src/main/java/com/stevenschoen/putionew/fragments/FileDetails.java @@ -142,6 +142,16 @@ public void onGlobalLayout() { } toolbar = (Toolbar) view.findViewById(R.id.toolbar_filedetails); + toolbar.setNavigationOnClickListener(new OnClickListener() { + @Override + public void onClick(View v) { + if (hasCallbacks()) { + callbacks.onFileDetailsClosed(); + } else { + getActivity().finish(); + } + } + }); if (isAdded()) { if (UIUtils.isTablet(getActivity())) { toolbar.inflateMenu(R.menu.menu_filedetails); @@ -272,21 +282,8 @@ public void onClick(View v) { fetchFileData(); - ImageButton buttonClose = (ImageButton) view.findViewById(R.id.button_filedetails_close); - buttonClose.setOnClickListener(new OnClickListener() { - @Override - public void onClick(View v) { - if (hasCallbacks()) { - callbacks.onFileDetailsClosed(); - } else { - getActivity().finish(); - } - } - }); - View buttonPlay = view.findViewById(R.id.button_filedetails_play); if (getCurrentFile().isMedia()) { - PutioUtils.setupFab(buttonPlay); buttonPlay.setOnClickListener(new OnClickListener() { @Override public void onClick(View v) { diff --git a/app/src/main/res/drawable-hdpi/ic_action_close_black.png b/app/src/main/res/drawable-hdpi/ic_action_close_black.png deleted file mode 100644 index 9c38e84d14e4345e84ccae3c30bd722c4791cb93..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 373 zcmV-*0gC>KP)|NDQ{!fBmdseb@NaH?F@6fTJA@2f_ie z1Mv!x4W!e<0lI}`fpCCqAf3)Sa7qf^qzbAA18_;gAJctvLfli{b-JIP8eV`QE%ur% zXdoy=7N5(U(~l8_@B-L6r2qti$^Bwv0K5<~@g{%;Kp~{!RRFaRa`8%lEr?yjs{z&^ z?75A~d?A~Cb0{hHK)FcS?fL&w@q0Ls#V$d}#RtI33)=K6v@~s+*~Gs_<=>Cd8i6%2 zn`5&KP>fMT7!q3r!vc5&d2&`^7yw2HlPme0wqxK(ejbz%L#hWKPZh^oOj;1Mg&2>^LZ!Ghrc*f4o`I3RB+STGy_8zv7A2jndU3x)$=!{p%~+KWmt T5MQlf00000NkvXXu0mjf!UvY% diff --git a/app/src/main/res/drawable-hdpi/ic_action_copy_black.png b/app/src/main/res/drawable-hdpi/ic_action_copy_black.png deleted file mode 100644 index 043eed6ca255b4bcca83702a5b4290a4b15f0fdf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 352 zcmV-m0iXVfP)})V_#wA8aT0*#&953V;_+G47e~P zVi2%4w%^ePz#SL^``iSqec_Ydwnieu=Xr y#VjHMj9Mwi%7GNBGIPoSMy(WMUV>xMD&kK5D$00003-ytE8%%(X zjCH=azXEm~>nI&=6R=O#SwZGcI4!U%;CiRn1l+S)uW&^pViVj6`0sFz!KHwkOR))f zB)XBCp&a3juo-YvF8nttmH<VRp`zurR6 z2<&zpvY11x0%8xbIuP4|7YgXA@(`FN)LP zyiI^<)-X5$H&S7F$143K8Uc=uLfRrRhIoKNu8Sy!YhElVT+C0ZEm2;2UKvQ!(Sb;|Kr%002ovPDHLkV1hte+A9D6 diff --git a/app/src/main/res/drawable-hdpi/ic_filedetails_close.png b/app/src/main/res/drawable-hdpi/ic_filedetails_close.png deleted file mode 100644 index 69302818fa9fe8b00b273c04d8b0bdc4d16f3e34..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1565 zcmV+&2IBdNP)yahE4Fm&xayziOY(T=t=?Q5# zz2yUDfZeizY5-<{-DXP?;K2tLfz5aWHs4PY*06Z+KfC{eYQ!6O0;tD^gbe{+c3_~; z^5X%g90iC(vXgd?(+NBQ40k0*D*`gIlN)f#kwYdUJ0%iUa&#r2B0ISOflUZ9hYZZ# z@*zn{$xaTll^k6NK*~;TKuELhk4AzA|BIVDr0LY{Do1CZ=fgm$fQudYP=UD;aIu(y zC)@)8;6ksly$bCP5txwy7YpYPAONzRICsSkkjjp3woVYi%Ey4PdTRxL>35TI#3VZl zMpv~6vmo$Xv<)-9_S$0+i8rK0+jv`YNk)7bCW~vhAmZRO)35|JvPA!tEkh>Se zDM!1k6FT$!n1pOxEZq$SPiQSP&=)`rE+g7A2i&3o)}99d3Di=X^N}gXcSP=rW>jX=Az8V1m2}7SJSdzdR_;6gz10p#Z^4^j4fGbu9 z)R-2q%1s)`EIVv@ehnLO4-g8>D}Y82Tm!Q8_%H&b>I6UWArjXLa;e`?0)(nk7?$#W zeh!aevLjlEVXTB%uQ8{rwNZPYb+`uvF@f{FqZ+`a<4uKL&k5B%AR>XQPH4eI{SzxS z4-l#oC?uHp$WWaCfxwI*K_%d-6=E1f1_oxefNPonfjS{IUlX!pCJ3hxVyeDO}Dpl!6v>TS3{$U8$Lj zNIeEHKSrdOhKZU$l>p}Vb|~O4ZI631j`_Wv7Vwuo$GaUpFyLZ|Q7hDjOAvFwU48&> zK9aa`@nl(|ydipKy6*~$HC@5pmefzGuT zC4f24M^&!^LB9F>1Pn=H1Tg3Mq%@IPjzsGO5dtg#plJXY%U{~C6JSXKG$fD$KD1>e zz+w=zcugTmYy>dN4l3YctxdoyZGEO{d4dZ`Rt==v1FXAvR1k7L@??3Q&_%!=f?O<9 z0^ZtHCo~hVmozUGCz$1^t4?Slz|sV;fjHv{>c4kHCcv5tw-NyTEJ!GcfIS6VEHT=1 zLKDC&JFIy=7VKO*0k1~a2`BetQOs)hl z%Z{l$zlVUJVqR9s?j3HsjFo`wpbL@S*^KHhWuS8@Ljr>$a^wb`i+R#W;9O_zvY02V zhdYYw=Z0@>5Qu};`7X&#XP@7iNLf#soe4*(YW5(6_>KCHJ4*j=_%C5(}yo67ThiA1LH zSJ?^Am%A5Kk|WZKvb~erOaDrpu#%lB0X{GT39%ea*(q2=MvgYJgCZcvj-XC}z&vFK z;f|3Uf#t*VfaPPt%?Ow$Vo)bMy8S8lWeVcD4%Nha!h@Ui2ZtG?>Dlcs*0%W6S`{M? P00000NkvXXu0mjfvSPhm diff --git a/app/src/main/res/drawable-mdpi/ic_action_close_black.png b/app/src/main/res/drawable-mdpi/ic_action_close_black.png deleted file mode 100644 index 54db3fd22a2c5b613a68acb75417722e8507ec07..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 291 zcmV+;0o?wHP)OiYNa0#S-T zS8>a&rb(zlgv9BNw*=y34T5`OyZg^2VJiU7eL`@JHE$M=I8bwfYa#Jp0mOFZVY_MF z@wFMEB`9mo0p8fTzzx5MBTo#nx>vA-ay@;g6B^ priAysB?t>x2NNJ2NC$>H@CFD>LLo}ZdlUcw002ovPDHLkV1m1Tb58&O diff --git a/app/src/main/res/drawable-mdpi/ic_action_copy_black.png b/app/src/main/res/drawable-mdpi/ic_action_copy_black.png deleted file mode 100644 index 7d5e426056a1eaf40d0e910f142abced2a8c9aa7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 339 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=hEVFiLs4IEF;HC#Ogx9I!a>&A7)Z z!GxuQlQA*D=_*rFnv&2P-37DKT~;(}D?VZHU2v+^A&2LPkBh_{z7XSXj#3wE1=bZs zW&-(akBVI+c!J8OfyH=N6sZYJeq)>@>!`ssLDqmjBZE!AoxzY@P%MUd)k?NU$A4Uz z^r+#mL$e>#M{$LHo(CBBTqp@PjKcB+tH9^y-U=k`4nTD!}U3AkGLK7v^oUxbm;}ShOr+x zJ4MAQWv`9HITnRJwxp!&!xb634!&e_+N!wA&1^w~oj|cL2jhe6jJ0) fega#@$j`{oRUNIUTq@rK3@ipuS3j3^P6b z@tdSL5Ss%)hI5l*2$I@AK(;p!?;=(|wH*Mmw;za$2GRi&ftD9g;()I}&0NG9fJNP? z14cuD;t=?Tr4%G3O%8nroCSKM;kH2-NqPz>7o=gN}y~yIPg5d zN?@7=a%qE8#0NCEI#h}bvPTy_;|7{M-*I6&56~##Anu@){oYt}GeM0Kx&}sNz{`$t z4}dT)n5+`Kn2#=z1t5ShIVE^9&jOGrAr=$TIMXC1D4A!AxuOE1wIR*?wM1Gea;0`k z<}pM4;?gt=fWaL^1K_}EO@IghLttbjI0gWz=Q*t6^C}k<17J{sDn%+~U;V8r01Qf~ zVnrG7s=gu00?t86#7-~fO#rk~LQm$+03bf}<%A~JWfSI`1CS`8c0C~l!Bk91+@XmJq#st6v)F}8In9A^1b{=x@?2TZ ze-9T}bP!Zlbz@?iPa1S&o&wS&9l8d=2F&L`aNVim27r?J?@3$3gR9ydwl z7*Gbhs^BAKp0@KI+i{~LS;3v`2FX@RIBu3UM%ejpm-ndWwE@lRJ!N3rY_Ncr7k^|1 zkCw%Qk{l^rQXMyl((_6sYz|F@7=R$q1Cw2rrM1S6fFRjy_5avhvLrR8gh?}BnIiWO zP7)B7d33g*1h$y)mau1kq?qFmPZJOpaeV#@*E^hreFRr000000NkvXXu0mjf^qY$H diff --git a/app/src/main/res/drawable-xhdpi/ic_action_close_black.png b/app/src/main/res/drawable-xhdpi/ic_action_close_black.png deleted file mode 100644 index 50c3f6a60d69fa13685df07d7813a475eb35d298..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 537 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV0_@|;uum9_jcw(UuHv|*4v^p zxH!cY*uP*hU`}F-Sn!vTTcmU43`S|wAd%P?KR-R1_b6QRRlnJ~zk8=!yv#K}7=Qc0 z*L;o!J`TSIZ-pI%(X%GglN_;@qmd>1;=J*TLtuFuM9_M8WA8*VL=U^{RnFJ7;4+U{o0 zzj5vlql6ZkAN>ETW-ae7i-XDhGl~yo@3fwgJKz5W?}4I2&Uci~8dNdOSX?u6!*1a! z#tj;t=)UR)wKqb-hEA! z@14o7m_4K64)e8ueoJ;H17+zPCRu|S3!W9dU@+cvQ0)R^GiR1wJ0A{-=i*W#v diff --git a/app/src/main/res/drawable-xhdpi/ic_action_copy_black.png b/app/src/main/res/drawable-xhdpi/ic_action_copy_black.png deleted file mode 100644 index 78338ca4c1d63fda171fbb763244763024ad0c49..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 529 zcmV+s0`C2ZP)WfKs4v1(X7X8^Em! zEJDb(vzUG0ojGIvfb&R!eW30Vh&}*wj)40O(kj3f&`uCz1fp38aEpa65EdUGvk>4u z%KZzBH%Ma8V67=20px(H{EbS1CImV_%sYDc4p@7LM-NP93ao?RF=EPt=nzKe5q1zq zR&1sK!4Yd#f{FRpc(!cCXA1Bck-NgUXC;gI--#7>`4U88F zP$?h>SY2gRP$_^NXb*NFoceJqtTQ08rw&0?0hK}Z0cwP-H5>EQ391#=T|k#1-3I^C zb+`jElLJD}_`ZzD6>%3xRW=Dw!evMfNGPBbPzqEE{M#2IsWadm4;u~_px+=qJn*eA zMN{iL#KUc(0H?s-wBj=bXn|b#M`+eca>V>6{I-JVTCte|1a1?E&@IkbiAM8ZF+NAU zd0?^y@ZdfZwBCUKn9ycr6>nb<;?(G4#;4Ws1&~dq>_?B Tb+<4200000NkvXXu0mjfAAi|q diff --git a/app/src/main/res/drawable-xhdpi/ic_action_createfolder_black.png b/app/src/main/res/drawable-xhdpi/ic_action_createfolder_black.png deleted file mode 100644 index 8b90cdc4bdef74abb769ca6d9fb6f229f91e1c05..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 598 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 adj1D-?V4C6S;uum9_jYEW-(dp*m)nyM z`f8{zzQdB|CYGqVs!4eH$$gQTI$u{e7T!B;(ObN?Vgbv#j9rKI#TepQ#1a?{7%lGc zZeW(AUckcg$Ksy*wa9GaSr?k+gMZJ_^`5&@?sMq2hHcM+g_b;E=W$|C zb>y?tRETa;sflu!#uE91i|O1n1>Shq1Cc^c9%^%1L^*N($YSc76u`D`QA4`wl&1As z3F}*mK1^lp@zUUok3A5^S$JpdX5-1bwj1wqcFA?^IrG_0_RekVSAX?0e~3z5c<^qb z0{{L=4Z5c^EJ#!oF_oq*p5a4=% z<4=%~7RL?d{XHzDjM*O^w@Eiw9kG~FrUu;)w}n64Dt4;Tuk;TPHDIcLeR$Rq z7FWjV2h*o6Pzopr09G~~2mk;8 diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_copy_black.png b/app/src/main/res/drawable-xxhdpi/ic_action_copy_black.png deleted file mode 100644 index 32395bc6cfe1c042009734b8495fe8615aa67b6d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 930 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7Ro>V9xY(aSW-5dmFPcD{1S%@H|x$j$YFnum(~f~KV$b&glU0;C;7T)4ICohNy@iYN+P+$oV* z8*_KFdHK7TNtFd2o2u_w7N?!tvz`0q+qc|%=tcP!*~1W&9WO<=lUz;De@_86A7vsXeWh+eRp*V+ zmUZtu-$Zs_*yMPZb=7Ov6R+kUnYWe0Q2L5cz*`Ncu>UIG*0^@uTu_%55Ub;~>)&L# zHTzxua&a-w4#{z|c5y*HoSz>sXRnc?g7szqIUIVarHpW`Cqu*AGj zw_iWw8{bE%kBdVe$FX==^eN>j^C@prym6yVX8nW4FPnbyCh>jT+sg4qaq;(tw-Vo` zW_)h9S^l=Z$71_TmK~jm`CB9`Zah~0q^B^C^>g>-s=@>8J{vYybp29ax9Ew|Bd@=g z>cii-Hr!d7HP7~s$6w_ifB!7FAN;4bt#@HM8FHM}GYdBkofc$>=E?)`o1Iu3YQ!Uh$EU zbinEQhQIf9%0E0|s=mSbs^0Bg=#j;o=QO?Ex;ET(_%AlG?pwhghK}HlCoHcnb~A7u zH#}l{B<={$BGYXy-@=bnyZmZ9o*(k;de?TjqB}mnCrsFFVdQ I&MBb@00Wbr8vpU|#0w;uum9_jZnLk8hwzYr2pl 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 + + diff --git a/app/src/main/res/drawable/ic_action_create_folder.xml b/app/src/main/res/drawable/ic_action_create_folder.xml new file mode 100644 index 00000000..a4dd6d23 --- /dev/null +++ b/app/src/main/res/drawable/ic_action_create_folder.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_toolbar_nav_close_black.xml b/app/src/main/res/drawable/ic_toolbar_nav_close_black.xml new file mode 100644 index 00000000..708e55ff --- /dev/null +++ b/app/src/main/res/drawable/ic_toolbar_nav_close_black.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_toolbar_nav_close_white.xml b/app/src/main/res/drawable/ic_toolbar_nav_close_white.xml new file mode 100644 index 00000000..d9e5298a --- /dev/null +++ b/app/src/main/res/drawable/ic_toolbar_nav_close_white.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/layout-h400dp/filedetails.xml b/app/src/main/res/layout-h400dp/filedetails.xml index 2b92710d..b6651a33 100644 --- a/app/src/main/res/layout-h400dp/filedetails.xml +++ b/app/src/main/res/layout-h400dp/filedetails.xml @@ -1,41 +1,45 @@ - + - + - + - + - - + + \ No newline at end of file diff --git a/app/src/main/res/layout/filedetails.xml b/app/src/main/res/layout/filedetails.xml index 00cacd0d..f6d119ae 100644 --- a/app/src/main/res/layout/filedetails.xml +++ b/app/src/main/res/layout/filedetails.xml @@ -1,55 +1,57 @@ - + - + - - + + - + - + - - + + - - + + \ No newline at end of file diff --git a/app/src/main/res/layout/filedetails_toolbar.xml b/app/src/main/res/layout/filedetails_toolbar.xml index 0b6ffd79..ed4dd384 100644 --- a/app/src/main/res/layout/filedetails_toolbar.xml +++ b/app/src/main/res/layout/filedetails_toolbar.xml @@ -1,26 +1,14 @@ - - - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/menu/context_files_multiple.xml b/app/src/main/res/menu/context_files_multiple.xml index 514bcd91..4cbe2c73 100644 --- a/app/src/main/res/menu/context_files_multiple.xml +++ b/app/src/main/res/menu/context_files_multiple.xml @@ -11,7 +11,7 @@ app:showAsAction="ifRoom" /> + xmlns:app="http://schemas.android.com/apk/res-auto"> - + - + \ No newline at end of file diff --git a/app/src/main/res/menu/menu_transfersdialog.xml b/app/src/main/res/menu/menu_transfersdialog.xml index 0774f193..b208e44a 100644 --- a/app/src/main/res/menu/menu_transfersdialog.xml +++ b/app/src/main/res/menu/menu_transfersdialog.xml @@ -1,12 +1,12 @@ + xmlns:app="http://schemas.android.com/apk/res-auto"> - + \ No newline at end of file