From 6b928e4ca4424a1a41aae993b3d3541c7bfdda6b Mon Sep 17 00:00:00 2001 From: Eric Kok Date: Fri, 4 Oct 2013 11:40:09 +0200 Subject: [PATCH] Added option to change a torrent's storage location from the details screen. Fixed #8. --- .../res/drawable-hdpi/ic_action_save_dark.png | Bin 0 -> 394 bytes .../drawable-hdpi/ic_action_save_light.png | Bin 0 -> 398 bytes .../res/drawable-mdpi/ic_action_save_dark.png | Bin 0 -> 362 bytes .../drawable-mdpi/ic_action_save_light.png | Bin 0 -> 359 bytes .../drawable-xhdpi/ic_action_save_dark.png | Bin 0 -> 441 bytes .../drawable-xhdpi/ic_action_save_light.png | Bin 0 -> 451 bytes .../drawable-xxhdpi/ic_action_save_dark.png | Bin 0 -> 495 bytes .../drawable-xxhdpi/ic_action_save_light.png | Bin 0 -> 500 bytes core/res/layout/dialog_storagelocation.xml | 29 ++++++ core/res/menu/fragment_details.xml | 6 ++ core/res/values/attrs.xml | 1 + core/res/values/changelog.xml | 1 + core/res/values/strings.xml | 2 + core/res/values/styles.xml | 2 + .../transdroid/core/gui/DetailsFragment.java | 24 ++++- .../navigation/SetStorageLocationDialog.java | 92 ++++++++++++++++++ 16 files changed, 155 insertions(+), 2 deletions(-) create mode 100644 core/res/drawable-hdpi/ic_action_save_dark.png create mode 100644 core/res/drawable-hdpi/ic_action_save_light.png create mode 100644 core/res/drawable-mdpi/ic_action_save_dark.png create mode 100644 core/res/drawable-mdpi/ic_action_save_light.png create mode 100644 core/res/drawable-xhdpi/ic_action_save_dark.png create mode 100644 core/res/drawable-xhdpi/ic_action_save_light.png create mode 100644 core/res/drawable-xxhdpi/ic_action_save_dark.png create mode 100644 core/res/drawable-xxhdpi/ic_action_save_light.png create mode 100644 core/res/layout/dialog_storagelocation.xml create mode 100644 core/src/org/transdroid/core/gui/navigation/SetStorageLocationDialog.java diff --git a/core/res/drawable-hdpi/ic_action_save_dark.png b/core/res/drawable-hdpi/ic_action_save_dark.png new file mode 100644 index 0000000000000000000000000000000000000000..0fe36a1ec3d5519890f4a978080ab567401f6cf4 GIT binary patch literal 394 zcmV;50d@X~P)GDd`KZz4U!n2!bF8Vg~}1uL2sk0CtQ#x7_sKTZkQf3;ueQ2hi^I2o#WqBmqd8LtzI#nGqM_^ zoRLLaNL(B<>5+u=m4G&hi=)A1H3?Sb`xlI5`=&c~& z#0^M9hTOp3(iVY8w?3j1GYU;AN;qnI#9;>CifKY5;6o;cz4o?hA|Dj+se(7Kp=9X$ z+dF-LPQ2ZTRqsE#iLtg(POIL3w4#vsz89TNpfyzY*H%pE?8b#r=%1pHsg}}6o9TT^ oxkR9H;INe-2!bGv!bgAs0M`Oe{s;Z08UO$Q07*qoM6N<$f`(h64gdfE literal 0 HcmV?d00001 diff --git a/core/res/drawable-hdpi/ic_action_save_light.png b/core/res/drawable-hdpi/ic_action_save_light.png new file mode 100644 index 0000000000000000000000000000000000000000..c4b7783ccc4eca742de2b7eca8a3e931abbcb8bb GIT binary patch literal 398 zcmV;90df9`P)pqPHqBJ2KMjBH=%-8&Z|T47fu zz)>;xq){v8;w2EFV=g^F2wwr%5TT>VWj2JX0J9-n1{feRp8*1&UC3G;c+;p7(fs&4`SW_AC4ZqJ8piQ*8TrsS9co#y2gdI1Gcizri}}-&_87%Q!S;D sHq-l-atfezV6klgK@bG3rH=pu0H2{ob7jo@O#lD@07*qoM6N<$f-EMaDF6Tf literal 0 HcmV?d00001 diff --git a/core/res/drawable-mdpi/ic_action_save_dark.png b/core/res/drawable-mdpi/ic_action_save_dark.png new file mode 100644 index 0000000000000000000000000000000000000000..ea3391621f603e15bd3db4414ef02db84f85bab7 GIT binary patch literal 362 zcmV-w0hRuVP)F4>9WY`O{Qv*I8j#|J za-TCYGCm{LKqS4Nf%wq&z+*v?_W}(T0EKoz!26iY=ZYGdz3>9kxifzW{02VSs z4rKXEG_hGwj12054r0LP2qrp2GsqFX1L**~j$oo=g0CNF2T(N;eg@*R=(&Ja4v+%I zpD`BkSy-~KF;e+KQ9*QuCZ!%Dqsfp=16zQ2GnwXtvYrp64tNF(y0hfijw9_1!E6Zi z$xIT=JqrxAbZV9Z&#`4Y0_v$30?_urtbvRIDMG0kOWR;GHKRZhh|@?(1H@)sVxs_L zpb0IaU`S*`V_+IcBh!3>1<`<4M#MDBsRf8?rjLS=2LJ*L06~OV-|$Zt4gdfE07*qo IM6N<$f*u=)2><{9 literal 0 HcmV?d00001 diff --git a/core/res/drawable-mdpi/ic_action_save_light.png b/core/res/drawable-mdpi/ic_action_save_light.png new file mode 100644 index 0000000000000000000000000000000000000000..61304a68c71248d1919e3a7f5eff3c834bf61c6b GIT binary patch literal 359 zcmV-t0hs=YP)F4>9WY`OG&VMt1yY<) z?%T6x&%PzrKqS52f%+a3QqO`zyatKA1&BAJS;7URWYF}$92y41YEX3xfMUnVaR4Cz zvb-2g48x&7kN|W913pJE(IJ{aj<6g^2jF!C6CD$L!azHKs)_JB5Z^)*dqXP+2m|9! z4U70@EMkb&tV zwj@*orU73v%~zv}1Bfw*+9A+FYPCva8)6iU0t^5UU;w40M4ufCPG|rC002ovPDHLk FV1jPxec1p2 literal 0 HcmV?d00001 diff --git a/core/res/drawable-xhdpi/ic_action_save_dark.png b/core/res/drawable-xhdpi/ic_action_save_dark.png new file mode 100644 index 0000000000000000000000000000000000000000..dde278b5e2186411cc5d71f54f5b7fc278066e90 GIT binary patch literal 441 zcmV;q0Y?6bP)@_6J5wKF2%}Nf{+psjI zdDFy3;z>io^2fJaH8Go0G!AW4BrGD&VS|J+R{>v3NI}3?5>gTHv4oTad?X9%LkkCR z#~GY9SD=TMk~Zmcg|u)D9{^ftX+xW_WK$p~7?=tBc~7!dGAn!h_A}l!&H(@b03^y& z*NSia?tyO?>-%N_^?DSsl`K@vN-W7EhErB#l4I619M{#y;Ct^M{BwQmP zQ)tbR6yr)^nfDNIe;vH0Meie z>j%YOcp;#}9-ax3eF}yE0uX=zZ`K0!hmW~oyzknd;phR%*E<@o_Ksc)knXvwx+#+& z0uYdF8m#u?-wfmZs^=MRvq0b3ZejHq0-mSA>K$Mjk^r&*0uaC?sFD9a=>Z7{I0W=u t2a6%Fbie#r+C%mZ00000{^m!30RTljO2DMue~kbD002ovPDHLkV1f+awb=jw literal 0 HcmV?d00001 diff --git a/core/res/drawable-xxhdpi/ic_action_save_dark.png b/core/res/drawable-xxhdpi/ic_action_save_dark.png new file mode 100644 index 0000000000000000000000000000000000000000..ccf8c82cd562b4b72f1652b0aaa6db771b4eb712 GIT binary patch literal 495 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGok|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+7$&)Pcx)8=rJT8VDP!XXvOe~ zL6$-61;gBC)(BrVy8Z@Vk?{WiE>2HFJz2ZT71_b+(8E4Kge zJH?hVF4?}fcaPkCEib=)%w_|r_^St z%72+{p$}zLWmcbP=t)&(ePZz7%K1iBRnLr~lta5Ft^TB%x0~^Ku3Orn%c^UnM0DL* zM5Z}7BywV>{xq{NX|*vhaWF8lED#9&qaf_Gr)-x<~`r7%GBHY8@qE!*O? zN&mJb=LWAJpq>5#A5>c&Crx;*?~~@8>%ATvd<+Z=c~$GtHLn+>uQ1fCtZdO<(qcG=yB z8_o+Hx-MZQbGur&ynKI6P2bx;CvMJrdf=SRvAgRIFFapp-TP#b_d)wV7ne`hcxW4* zEXI8PzV8Mt8&}TRT1E=VH$50{ezW+xHQm!wXqL>(4QrmP+S7Y`*YV2h%*GEN35oG` zO;cv#@>W=|fdxDD&yk5y)R}>irGbGdphK%}0;i(P<98a&4h=$A`g7-OvhP`Pezhgn zjUCsfDlj=PFe)TWJAC0w-LsvWZY;Sj^?tdM!d{i?Rhqx-U(4}%O{iwzP+(vYU|{k& z@=7YXT=iVwHzNm5CdPM+H?#7p^tOoCNrKF1U=T=a$O&k}uBtL)x1YZAk16`-XBjEwnC7CLM@{~b!%bYmdKI;Vst03?yYO#lD@ literal 0 HcmV?d00001 diff --git a/core/res/layout/dialog_storagelocation.xml b/core/res/layout/dialog_storagelocation.xml new file mode 100644 index 00000000..5b9261b2 --- /dev/null +++ b/core/res/layout/dialog_storagelocation.xml @@ -0,0 +1,29 @@ + + + + + + + diff --git a/core/res/menu/fragment_details.xml b/core/res/menu/fragment_details.xml index d707fc48..294912ce 100644 --- a/core/res/menu/fragment_details.xml +++ b/core/res/menu/fragment_details.xml @@ -68,5 +68,11 @@ android:showAsAction="ifRoom" android:title="@string/action_updatetrackers" android:orderInCategory="206" /> + diff --git a/core/res/values/attrs.xml b/core/res/values/attrs.xml index 593c89a9..5bd9fc95 100644 --- a/core/res/values/attrs.xml +++ b/core/res/values/attrs.xml @@ -35,6 +35,7 @@ + diff --git a/core/res/values/changelog.xml b/core/res/values/changelog.xml index 5adbbe17..2061b237 100644 --- a/core/res/values/changelog.xml +++ b/core/res/values/changelog.xml @@ -18,6 +18,7 @@ Transdroid 2.0.0\n +- Allow changing of storage location (Deluge and Transmission)\n - UI improvements for Lite version\n \n Transdroid 2.0.0-alpha4\n diff --git a/core/res/values/strings.xml b/core/res/values/strings.xml index 4991ea10..cb3b21fa 100644 --- a/core/res/values/strings.xml +++ b/core/res/values/strings.xml @@ -48,6 +48,7 @@ Remove and delete data Set label Update trackers + Change storage location Off Low Normal @@ -354,6 +355,7 @@ Can\'t write to the settings file Please enter a positive number Please enter a valid label or pick from the list + Please wait until the torrent details have been loaded New Transdroid version available New Transdroid search module available diff --git a/core/res/values/styles.xml b/core/res/values/styles.xml index c8436e9d..bf67e11f 100644 --- a/core/res/values/styles.xml +++ b/core/res/values/styles.xml @@ -34,6 +34,7 @@ @drawable/ic_action_remove_light @drawable/ic_action_resume_light @drawable/ic_action_rss_light + @drawable/ic_action_save_light @drawable/ic_action_search_light @drawable/ic_action_sort_by_size_light @drawable/ic_action_start_light @@ -64,6 +65,7 @@ @drawable/ic_action_remove_dark @drawable/ic_action_resume_dark @drawable/ic_action_rss_dark + @drawable/ic_action_save_dark @drawable/ic_action_search_dark @drawable/ic_action_sort_by_size_dark @drawable/ic_action_start_dark diff --git a/core/src/org/transdroid/core/gui/DetailsFragment.java b/core/src/org/transdroid/core/gui/DetailsFragment.java index be497616..91c7917f 100644 --- a/core/src/org/transdroid/core/gui/DetailsFragment.java +++ b/core/src/org/transdroid/core/gui/DetailsFragment.java @@ -36,6 +36,8 @@ import org.transdroid.core.gui.navigation.NavigationHelper_; import org.transdroid.core.gui.navigation.SelectionManagerMode; import org.transdroid.core.gui.navigation.SetLabelDialog; import org.transdroid.core.gui.navigation.SetLabelDialog.OnLabelPickedListener; +import org.transdroid.core.gui.navigation.SetStorageLocationDialog; +import org.transdroid.core.gui.navigation.SetStorageLocationDialog.OnStorageLocationUpdatedListener; import org.transdroid.core.gui.navigation.SetTrackersDialog; import org.transdroid.core.gui.navigation.SetTrackersDialog.OnTrackersUpdatedListener; import org.transdroid.daemon.Daemon; @@ -65,7 +67,8 @@ import de.keyboardsurfer.android.widget.crouton.Crouton; */ @EFragment(resName = "fragment_details") @OptionsMenu(resName = "fragment_details") -public class DetailsFragment extends SherlockFragment implements OnTrackersUpdatedListener, OnLabelPickedListener { +public class DetailsFragment extends SherlockFragment implements OnTrackersUpdatedListener, OnLabelPickedListener, + OnStorageLocationUpdatedListener { // Local data @InstanceState @@ -187,7 +190,7 @@ public class DetailsFragment extends SherlockFragment implements OnTrackersUpdat * @param currentLabels The list of known server labels */ public void updateLabels(ArrayList