From b8f725c8438e5fdc2c60ca1e3f6c711249fa9827 Mon Sep 17 00:00:00 2001 From: Martin Fietz Date: Tue, 2 Feb 2016 09:53:40 +0100 Subject: [PATCH] Add new folder icon to directory chooser menu --- .../activity/DirectoryChooserActivity.java | 9 +++++---- app/src/main/res/menu/directory_chooser.xml | 16 +++++++++------- .../ic_create_new_folder_grey600_24dp.png | Bin 0 -> 198 bytes .../ic_create_new_folder_white_24dp.png | Bin 0 -> 191 bytes .../ic_create_new_folder_grey600_24dp.png | Bin 0 -> 152 bytes .../ic_create_new_folder_white_24dp.png | Bin 0 -> 149 bytes .../ic_create_new_folder_grey600_24dp.png | Bin 0 -> 248 bytes .../ic_create_new_folder_white_24dp.png | Bin 0 -> 239 bytes .../ic_create_new_folder_grey600_24dp.png | Bin 0 -> 343 bytes .../ic_create_new_folder_white_24dp.png | Bin 0 -> 339 bytes .../ic_create_new_folder_grey600_24dp.png | Bin 0 -> 466 bytes .../ic_create_new_folder_white_24dp.png | Bin 0 -> 463 bytes core/src/main/res/values/attrs.xml | 1 + core/src/main/res/values/styles.xml | 5 ++++- 14 files changed, 19 insertions(+), 12 deletions(-) create mode 100644 core/src/main/res/drawable-hdpi/ic_create_new_folder_grey600_24dp.png create mode 100644 core/src/main/res/drawable-hdpi/ic_create_new_folder_white_24dp.png create mode 100644 core/src/main/res/drawable-mdpi/ic_create_new_folder_grey600_24dp.png create mode 100644 core/src/main/res/drawable-mdpi/ic_create_new_folder_white_24dp.png create mode 100644 core/src/main/res/drawable-xhdpi/ic_create_new_folder_grey600_24dp.png create mode 100644 core/src/main/res/drawable-xhdpi/ic_create_new_folder_white_24dp.png create mode 100644 core/src/main/res/drawable-xxhdpi/ic_create_new_folder_grey600_24dp.png create mode 100644 core/src/main/res/drawable-xxhdpi/ic_create_new_folder_white_24dp.png create mode 100644 core/src/main/res/drawable-xxxhdpi/ic_create_new_folder_grey600_24dp.png create mode 100644 core/src/main/res/drawable-xxxhdpi/ic_create_new_folder_white_24dp.png diff --git a/app/src/main/java/de/danoeh/antennapod/activity/DirectoryChooserActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/DirectoryChooserActivity.java index 25dc64232..62e85120d 100644 --- a/app/src/main/java/de/danoeh/antennapod/activity/DirectoryChooserActivity.java +++ b/app/src/main/java/de/danoeh/antennapod/activity/DirectoryChooserActivity.java @@ -6,8 +6,8 @@ import android.os.Bundle; import android.os.Environment; import android.os.FileObserver; import android.support.v4.app.NavUtils; -import android.support.v7.app.ActionBarActivity; import android.support.v7.app.AlertDialog; +import android.support.v7.app.AppCompatActivity; import android.util.Log; import android.view.Menu; import android.view.MenuInflater; @@ -34,7 +34,8 @@ import de.danoeh.antennapod.core.preferences.UserPreferences; * Let's the user choose a directory on the storage device. The selected folder * will be sent back to the starting activity as an activity result. */ -public class DirectoryChooserActivity extends ActionBarActivity { +public class DirectoryChooserActivity extends AppCompatActivity { + private static final String TAG = "DirectoryChooserActivit"; private static final String CREATE_DIRECTORY_NAME = "AntennaPod"; @@ -250,8 +251,7 @@ public class DirectoryChooserActivity extends ActionBarActivity { @Override public boolean onPrepareOptionsMenu(Menu menu) { super.onPrepareOptionsMenu(menu); - menu.findItem(R.id.new_folder_item) - .setVisible(isValidFile(selectedDir)); + menu.findItem(R.id.new_folder_item).setVisible(isValidFile(selectedDir)); return true; } @@ -333,4 +333,5 @@ public class DirectoryChooserActivity extends ActionBarActivity { private boolean isValidFile(File file) { return file != null && file.isDirectory() && file.canRead() && file.canWrite(); } + } diff --git a/app/src/main/res/menu/directory_chooser.xml b/app/src/main/res/menu/directory_chooser.xml index 7735ffd2c..3f860d636 100644 --- a/app/src/main/res/menu/directory_chooser.xml +++ b/app/src/main/res/menu/directory_chooser.xml @@ -1,14 +1,16 @@ - + + + android:icon="?attr/ic_create_new_folder" + custom:showAsAction="ifRoom|withText" /> + android:title="@string/set_to_default_folder" + custom:showAsAction="collapseActionView" /> - - \ No newline at end of file + diff --git a/core/src/main/res/drawable-hdpi/ic_create_new_folder_grey600_24dp.png b/core/src/main/res/drawable-hdpi/ic_create_new_folder_grey600_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..bfe98fd0756f1837f8685a9eee8a8a0bb89eba1f GIT binary patch literal 198 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k1|%Oc%$NbBdOcknLn>~)z3$7^pdjKF=)N=Q zxt`*M+F9BL%&i5JrrF8=2<;&#PUI0 z!>&cA8Xac%Yb)(+C~A{_@qmp>M4`5ub;Z}&3~PC_?k+WT*zEXYC1cbho!4czesfA( x|2^sd*1s<$Q!eTDC8g<|X`8O?zz|r*^ti(9@hSVu4}lJ2@O1TaS?83{1OPF|Ozi*w literal 0 HcmV?d00001 diff --git a/core/src/main/res/drawable-hdpi/ic_create_new_folder_white_24dp.png b/core/src/main/res/drawable-hdpi/ic_create_new_folder_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..a8b0ada87769b86d99843689c1fb80362fc204fa GIT binary patch literal 191 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k1|%Oc%$NbB+B{txLn>~)z3$7^pdi4S5MKG# z(rLl>IW`AV5-zOMk!`QxzZYf~@~2Sgkk7+?GM|QLY**)9V!4nZU}owNd?)p6-ft6z!)xV##&5n? p+w4?%H1o`v#>fxFtQ-nw-~HTPZr$^=Sr+Ib22WQ%mvv4FO#p*TN%;T( literal 0 HcmV?d00001 diff --git a/core/src/main/res/drawable-mdpi/ic_create_new_folder_grey600_24dp.png b/core/src/main/res/drawable-mdpi/ic_create_new_folder_grey600_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..eeed34653675332d9b15aebbc27efa1540f35732 GIT binary patch literal 152 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`Gj@t!V@Ar-fhHFR}T7pSI5Y;6$X zZff|UD)9e!qqN3WhWQUuqMOeA^jH1E)xn&Zd9XesI}PvDZ#gAnBgVj>pDf=l`quX%&?*K`S3j3^P6i+8^fHXv%gGv)E}G0 z?02d5@Pkl+TMxgUf5`8e(Vnb$K#}8ZfhLE>MIGKr=UMkiG1pXQaCkTP?=3x$A}hc+ zMJ|E=0LWns8xOSKN^@XgSitMBb-Dyd??lPOmHxIsZu)eHX~3MLxU|t`=#KQvGdiVnSWhc zUFW@xMdqs7O|F8#-6`A$oc9?`?_0W3?8B7vceV*kWbi(BkukWWfniJB0l5Zokp2}1 zUEgLmFfe>zG_XDb5=i*HfRlg5V*6L_#~T*1O}M5wX}gZ{`M9Z%zi#21sHT29?MBp| g9}7WtH|%HM!#KN)XQM#G{z#BkPgg&ebxsLQ0Q5Cm^#A|> literal 0 HcmV?d00001 diff --git a/core/src/main/res/drawable-xxhdpi/ic_create_new_folder_grey600_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_create_new_folder_grey600_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..802fc6fa019d5418e6686183210cef510157700e GIT binary patch literal 343 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1|&n@Zgyv2V3hN8aSW-r_4c+QUz3A?L!i}; z7MY6z9DBDL3py))loM+USYdHg%#7zG*Y4Awy5oJB^%=R!Chb}$Jd2N|fq{ub0ZagC ze}|bN9^x-Gd$~)y7+)xqaxco^^ORn8Dc5z5uR`YG#msXaOx*JDreeSbk6RxeN@#ef zsfK3yLi)Z(j&N0nD RDGUrS22WQ%mvv4FO#rfCcWM9t literal 0 HcmV?d00001 diff --git a/core/src/main/res/drawable-xxhdpi/ic_create_new_folder_white_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_create_new_folder_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..91cbc73d1e1ae653e585525d8dfef2cd5e0c9757 GIT binary patch literal 339 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1|&n@Zgyv2V3hK7aSW-r_4c+SSF?dYYhrm7 zr)|>2s>VC(0*<J1f{VvpqeWH|7DlouAd5dG-P zinm+O{&9+Cu2uQRbBk+1?h>X2U*|AJ`LkcBiet!SS7;DokNS1)aKk5$MSp2V+hA8O;YKjYPv1Lf*$Os*nSr%Bd zF(z%LlKZRzufh#{roN43pHsySx86CoKUDA2|9ukNr6O>{I+$1{-2TTPCUxh`_ILjh Qfq})~>FVdQ&MBb@0Eu*a^Z)<= literal 0 HcmV?d00001 diff --git a/core/src/main/res/drawable-xxxhdpi/ic_create_new_folder_grey600_24dp.png b/core/src/main/res/drawable-xxxhdpi/ic_create_new_folder_grey600_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..baf7b6ef799da4ebc97ad0013052b33ef64f61ef GIT binary patch literal 466 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7Ro>V4Ugc;uunK>+M}%ze5fTZHZ-7 z;?5t6?pCuZb9^*7B^i@o(PsUDUBb!tj-{%u@j09Ba`V;iJ-JjfB~5*egLd^WFf=eQ z2rw`(F*qv-v7Juw^?y&qaOVPoQ!?69HF{=iX;jgC YhVtFt&70m>dV<{G>FVdQ&MBb@0Py6cVE_OC literal 0 HcmV?d00001 diff --git a/core/src/main/res/drawable-xxxhdpi/ic_create_new_folder_white_24dp.png b/core/src/main/res/drawable-xxxhdpi/ic_create_new_folder_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..aa103bfd06386d8d9188923c9b0b0d0896f5c806 GIT binary patch literal 463 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7Ro>V4UXZ;uunK>+M}%ze5fTtO?~+ z;?5sBidmJpJ{p{ojB&7Nv;NS&QCP8X>E&gqTA%kmc^k2}|4aJCZ%W517Cy~lVPFtp zU|?l%U}Ok@G2OWeE|=UZxm+UN?$7Yy?&@XzzTZE7;oQo+W8OmY>=4Q7Ubue}mrffeEkOfVTB{b0>MFwdZf!T(gbzdnCf{+k+m7LqcKEk#Idiw%T*BXQrPVe%ecI;S+2P{)xwGajUpBp#Nk&kN&%Iu* zEN$oG?W{j4{XFuUqTJVSv5CuC$ESYB^R{iR%RzAy1`P%VE`|msh6M~Trp5m{#^k$3 TYql&a0K3Q2)z4*}Q$iB}W=W#5 literal 0 HcmV?d00001 diff --git a/core/src/main/res/values/attrs.xml b/core/src/main/res/values/attrs.xml index 3c83d5cf7..2d3379d95 100644 --- a/core/src/main/res/values/attrs.xml +++ b/core/src/main/res/values/attrs.xml @@ -51,6 +51,7 @@ + diff --git a/core/src/main/res/values/styles.xml b/core/src/main/res/values/styles.xml index b2c7ecec4..c4a731a53 100644 --- a/core/src/main/res/values/styles.xml +++ b/core/src/main/res/values/styles.xml @@ -58,6 +58,7 @@ @drawable/ic_indeterminate_check_box_grey600_24dp @drawable/ic_sort_grey600_24dp @drawable/ic_sd_storage_grey600_36dp + @drawable/ic_create_new_folder_grey600_24dp