From e8e46abc703f5067245ed490bb243dadc016104a Mon Sep 17 00:00:00 2001 From: Markus Meier Date: Sun, 6 Nov 2016 21:49:10 +0100 Subject: [PATCH] Import fix for issue #7 https://github.com/Arcus92/PlayMusicExporter/issues/7 --- playmusicexporter/.DS_Store | Bin 10244 -> 10244 bytes playmusicexporter/src/.DS_Store | Bin 10244 -> 10244 bytes playmusicexporter/src/main/.DS_Store | Bin 10244 -> 10244 bytes playmusicexporter/src/main/java/.DS_Store | Bin 10244 -> 10244 bytes playmusicexporter/src/main/java/de/.DS_Store | Bin 10244 -> 10244 bytes .../src/main/java/de/arcus/.DS_Store | Bin 10244 -> 10244 bytes .../de/arcus/playmusicexporter2/.DS_Store | Bin 10244 -> 14340 bytes .../actionmode/ActionModeTitle.java | 15 +++++++++++++-- 8 files changed, 13 insertions(+), 2 deletions(-) diff --git a/playmusicexporter/.DS_Store b/playmusicexporter/.DS_Store index ec715c8879335b534edf86020634c140d64dd616..c5b529f62a214efa96875ab73b4af1e69338c64c 100644 GIT binary patch delta 792 zcmZXR-%C?r9LC>A%g&+qjAYijEow)=wZ zU19B~WoO>b$5bgL7b+}PCfWocJ~5)4oKUh;%*}DdYMoP{LrEzs?@K3@OD#R1%R7zH}84J8-In*r(M^~%|q)aw4Cad~bZ%uz~((ZP;Lq1|G zj?|I>36nS(CgUVW=Eyu*)Et%0JjEuIgF!?CJlKXtG@}b4bfXUu?8gB_F$4(-Bq2jZ z7Lz!I(>ROsxPXh8!(}Ys25#aO9^eID;uT)w9X_Fe&-jL4_-%|(0&|uD^DG`(#NjXN z-P>DD`&PqptqJREIkQ+RDyueE*KBEM+|k_Dxm){QRii~~bNP+D9z#L2*&TvMXyQ0l zQhZRK5a4z0tklqgw3X8Vv-O7BPCIx#1GdgkyJ$D3lV)WFhs`ebgehgjQex+M_v)PP zkjJ?4Yk}tfBT62VCuEsCCGSar{2+hGUjQ3GQK|E-*V+2eUSu1_9`s^R=Nm-~hj0wT z7||JzBBe7P!xW}*1~bUxoXPnTu3#QlaShjT8+ULQ_pG>&B`o6^p6lS>-~&EB`cl`# F{{v}`uIc~) delta 816 zcmaiyO-NKx7>2)BEAFjx^Y}mGXn#Xy>ZE3=X+L9DPB=A6lTJ#-=-jEBI%CeLnAA{N zv~W>f!&OuiLApp%mnjteKoAjvltQ#{(;}B{f;uyIf`Xv4IEVAShxdFu?>AUKSU>JE z>!aMEkC<&Njn#RywqW3xc0tt_%>DM$Jf&At`&?aNEf@$js@)-RTJ6OYTe38kWXjo; zTTr~Sa^Hbjo}7}Jmd;qS=2HV<&9AB5dP9n7vpeAJRFe}_S<1XDN!Or&T-OqlNpq zRgz*=eI_d-5_PbySCkf?H>}olt77-X^(}b{bB9D<+$$MAg*L|A?OMRcLviPl?Myk| z;cZnrxKB20%gUM3)NAz3>*B?#-AwVc1v@)Mo1tVB#>;j~wW6Gge(m&z!mchgp!)dR z-~9zG)(8hlltZ~xK~8d$pMrFmhUgwm(sP=o8G1*v^o15_iI(XH{R9D6jZ~x~1DV(W z8;Vej5>(<4YT-Zw8sWhSG@}h?aSrY1Ko16R5tk6b4cx?S=orRbJjN4PMlps-yu>TK z#v6RVXUt;(i};Quy)^qslH;%=ljZ*vVd?)O{FG$mmXT@Nm|IY^W7pmq{cE~OcjgR4 z@?}0Ham<>tEZIt)vQ3hBLhQmylu}tF!4nOwj8#a2IbUh0RcwzeQsFBM)z0=y0zO}5 zs0UfC932NvR%4EctoFS4Nc{;o@(;ovX`a5(G7=$StsrX=RJRJE<*1Gkt%DOs(Ilug zqXj47#~EmXY?Ny+`p}OnxQc7IF6iD8bcb;VBe;(Tc!)=W@>7iC8744=X{?#Six}3WQW%t%OdgjkN<2X7wV3UoZBco!5V;Y7QqdBFJRO8$m+;Z-iGg|&3 zfs3M_&4r30f{LOn2+E9#vV~9twP;$@qD_lhg{xLAx-)koI*Y^k-uHaGAI~@6JKy{8 zsLR^a9Pl;=X9M2p`ub2X;B5@)GcKi2qCI-pF|FG@wyHrjp49r)DTPB67D}9+s_HFu zp_aDJ47XTq)IlZvb*WP?vKG&|#i$lbC>fi@%3WoQ4UP}1$H&$5B=-qIPOYe9bV!b+ zl|4yWJ)$ZyUlhcgWBHGPT1unGR88h7(QK^`Qnqg- zHawt=a9K2i8k;B^m{7)2YEt7pd2w4SWrOi#BB5yMlm&sj9ByaqU^aSpER~LoDw;9Y zn|%IGV=VoPtzy0C3)hj{(U&C$7IcrjGEPy95^%Us4L>%c1`TLK813jr1bx_xeheXo zIAkc$kj4Z~;3Q7r49?;l&f_Ak;|6Zx79QXQUg8y&@fIJE!6$shcl^+M%OgcyySgOW z{dXna|5oz3B)bQ@qf~NktghMG(7b(z{?p;q$2`+>8$^R|##QDnXMR>I2)rOy&^i_r z4WPWx^g^^rFv#(>rrSbWMFTEhW4dj$T`&;xqD*<2+ttxYDJPZ!wt~ tg&E9Z4yW_9F5nU_;|i|g8gAnb?&2QqV-ZVuhUW&o6}-oXN53kH#Xsq+tn&Z> delta 795 zcmZwFO-vI(6bJD42Q<4n3&TgDrF>}=H@TSTwA%xT&S5k2-kZ$q@6BlQX!B&3 zEv3B7nO9Xk;>;U%m%7BfqRhBx(^wj7^ywYJz!Cj|X1vTAGCUSbk;CJn=#Zs}By0A@ z{32I*&CWgZJUJyb&B9o#u4;jPy;Ilvj8m!Bus7iE)so{hS&o+2G8M%)(5{~w(EEqD zLz1G=oLq&SQ2qVdfuI`Ms`44htas!pN?RmT*QbfE8r!g`Kw;jHxEJ@w3Z2D_dAs$1 z%0scE+@(x8TGQii*Lt`rn+H`?GNolu>kH|@0B?*1Yqv4Q*AeXP6&DXB!x;-3XYJO6 z$Zr{Ac1M_lB+90Is-hxTTIlC9M{>Wn3e)#%P1 z4j0OToMYaWY0pv$lr56PLi1P$9>tVYk;mX&V z*}be@j`W_B!+bPE4o^Ys{jBy3{|EFlEznO|K|CZR3P`&^+$;bqu`3GLh$b9Fi$H8e z8&0AVr=bhT2;(5mV+dDp71wZGVBQj#Y)s_PMD5 diff --git a/playmusicexporter/src/main/.DS_Store b/playmusicexporter/src/main/.DS_Store index 13dbf3d62ce4c75e183b750541540e79f66ce10f..f6abffe78e39e95a3aff8d034173e2b5c337a84d 100644 GIT binary patch delta 32 ncmZn(XbIS`LO|HuLPx>Es8&az+R)I{NJqiU)ME2)0Z(xNp+E^E delta 32 ncmZn(XbIS`LO|HqSVzIcqE<(t+R)J4P)EVc(sJ`|0Z(xNpuPzr diff --git a/playmusicexporter/src/main/java/.DS_Store b/playmusicexporter/src/main/java/.DS_Store index 34ad79d81638af89a9ec37ce2a6c91f25cfc6d13..89c5af2cdc3f7ad9d02116bc412f6c4781d2089f 100644 GIT binary patch delta 32 ncmZn(XbIS`L_pZwLPx>Es8&az+R)I{NJqiU)ME2?0bg+dpv(y$ delta 32 ncmZn(XbIS`L_pZsSVzIcqE<(t+R)J4P)EVc(sJ{50bg+dph^iI diff --git a/playmusicexporter/src/main/java/de/.DS_Store b/playmusicexporter/src/main/java/de/.DS_Store index 9a2ed9c4098923e835a8af6f27e342997712884b..25dbeb3efee9264c8ea0f470bd75013976555410 100644 GIT binary patch delta 32 ncmZn(XbIS`NEs8&az+R)I{NJqiU)ME2q0e5i#p?V1= delta 32 ncmZn(XbIS`NEs8&az+R)I{NJqiU)ME2>0bOwbq-+U4 delta 32 ncmZn(XbISGL_pZsSVzIcqE<(t+R)J4P)EVc(sJ{40bOwbqv{Dh diff --git a/playmusicexporter/src/main/java/de/arcus/playmusicexporter2/.DS_Store b/playmusicexporter/src/main/java/de/arcus/playmusicexporter2/.DS_Store index 11ea9f33d996e74b570e89e607b4f80c329b1c0d..537d863fcc9bf2918302b2e9fbfdae46d546f409 100644 GIT binary patch delta 1863 zcmeH{TTE0(7=Zu(2i$W!9GP7%*+nr63xcrVLb)s!kvl3ViVFfFxNwfRvh0OjX$1{7 zq12>F3!bKz2cwBe(|bZwYPBy-FllSrhsG0mu{YDkhsKh|Caq~|I){bCCYbiAPn~4u z|L4EV{4?{NGqryzWCsAOJE;@{xVS3tZb+8MhiL$N;;cP4BaTmycf-qd1`q`w1R($; z5S$G=G*@ghPWRiQI~5GDK0)?ok`$rE?jTAY!a-q zXX9BhJ67=uc@tLa)Z>w&FN-E?C^UBRKLD!_Z}vb_BW3a>?-^Y(}0YAr^sN*eM#M}5I-oyL&Cq5(~Boi^R(q_t|tyDlx zDy1FNNG;SsozzV|G)R7m(l|}gv-BLDqgUt>y+QBMM;^LL*XTNZNw?@*`ho7nPDlp+ zM)SwS>PSmmdmNvk6+UNH`Q#Tps2q6=pDAncsePJye0|1dN$%h{s84ekts9uhcw0fY zWjV5QwrFRQ(`6>G&jfDCFK`wX8I~kQoJwvfd7`weT$W;qahx|%w{3s2YDcxCJ(Fxp zVhKz!ma407Xl#;J!s1zklWyD7(zH5D|i*Jacr*R4Gzt1{06_n@9_@)gumb)6h{dh8i7Qz zaB#9HpF>kb+sH+gR7=ftfZCVg=^`%;QJ7BA1f8ZcG)*tkt8^j81KCzFQC9(3alAek zZZp{uVl$V-W#glN;kocqoR*YbC>r^n7*SeP;zsRgwkg5AJPT!?&o`9+dHWl0gZ}|< Fe*sbzs`&r_ delta 132 zcmZoEXbF&DU|?W$DortDU{C-uIe-{M3-C-V6q~3gIoZI3MH0woU;$!Apg03VCPN-W zIzw?%d2zw!gA!is6CXq_X6KL)WCke%>gEO#t{@XOUi{8Hncqa0kzuk4kMiUM6LwAw TkP4tN29tA4CT(UCWnu;Z-e(uX diff --git a/playmusicexporter/src/main/java/de/arcus/playmusicexporter2/actionmode/ActionModeTitle.java b/playmusicexporter/src/main/java/de/arcus/playmusicexporter2/actionmode/ActionModeTitle.java index fb8b428..f8b3399 100755 --- a/playmusicexporter/src/main/java/de/arcus/playmusicexporter2/actionmode/ActionModeTitle.java +++ b/playmusicexporter/src/main/java/de/arcus/playmusicexporter2/actionmode/ActionModeTitle.java @@ -29,8 +29,9 @@ import android.view.MenuItem; import de.arcus.playmusicexporter2.R; -import de.arcus.playmusicexporter2.activities.MusicTrackListActivity; import de.arcus.playmusicexporter2.activities.MusicContainerListActivity; +import de.arcus.playmusicexporter2.activities.MusicTrackListActivity; +import de.arcus.playmusicexporter2.fragments.MusicTrackListFragment; import de.arcus.playmusicexporter2.items.SelectedTrackList; /** @@ -88,6 +89,11 @@ public boolean onActionItemClicked(ActionMode mode, MenuItem item) { MusicTrackListActivity trackDetailActivity = (MusicTrackListActivity)mSelectionList.getActivity(); trackDetailActivity.selectAll(); + } else if (mSelectionList.getActivity() instanceof MusicContainerListActivity) { + MusicContainerListActivity trackDetailContainerActivity = (MusicContainerListActivity)mSelectionList.getActivity(); + MusicTrackListFragment trackDetailFragment = (MusicTrackListFragment) trackDetailContainerActivity.getSupportFragmentManager() + .findFragmentById(R.id.track_detail_container); + trackDetailFragment.selectAll(); } return true; @@ -97,6 +103,11 @@ public boolean onActionItemClicked(ActionMode mode, MenuItem item) { MusicTrackListActivity trackDetailActivity = (MusicTrackListActivity)mSelectionList.getActivity(); trackDetailActivity.deselectAll(); + } else if (mSelectionList.getActivity() instanceof MusicContainerListActivity) { + MusicContainerListActivity trackDetailContainerActivity = (MusicContainerListActivity)mSelectionList.getActivity(); + MusicTrackListFragment trackDetailFragment = (MusicTrackListFragment) trackDetailContainerActivity.getSupportFragmentManager() + .findFragmentById(R.id.track_detail_container); + trackDetailFragment.deselectAll(); } return true; @@ -144,4 +155,4 @@ public void onDestroyActionMode(ActionMode mode) { updateViews(); } } -} +} \ No newline at end of file