diff options
14 files changed, 19 insertions, 12 deletions
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 @@ <?xml version="1.0" encoding="utf-8"?> -<menu xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:custom="http://schemas.android.com/apk/res-auto"> +<menu + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:custom="http://schemas.android.com/apk/res-auto"> + <item android:id="@+id/new_folder_item" android:title="@string/create_folder_label" - custom:showAsAction="ifRoom|withText"/> + android:icon="?attr/ic_create_new_folder" + custom:showAsAction="ifRoom|withText" /> <item android:id="@+id/set_to_default_folder_item" - custom:showAsAction="collapseActionView" - android:title="@string/set_to_default_folder"/> - + android:title="@string/set_to_default_folder" + custom:showAsAction="collapseActionView" /> -</menu>
\ No newline at end of file +</menu> 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 Binary files differnew file mode 100644 index 000000000..bfe98fd07 --- /dev/null +++ b/core/src/main/res/drawable-hdpi/ic_create_new_folder_grey600_24dp.png 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 Binary files differnew file mode 100644 index 000000000..a8b0ada87 --- /dev/null +++ b/core/src/main/res/drawable-hdpi/ic_create_new_folder_white_24dp.png 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 Binary files differnew file mode 100644 index 000000000..eeed34653 --- /dev/null +++ b/core/src/main/res/drawable-mdpi/ic_create_new_folder_grey600_24dp.png diff --git a/core/src/main/res/drawable-mdpi/ic_create_new_folder_white_24dp.png b/core/src/main/res/drawable-mdpi/ic_create_new_folder_white_24dp.png Binary files differnew file mode 100644 index 000000000..3b9eaa827 --- /dev/null +++ b/core/src/main/res/drawable-mdpi/ic_create_new_folder_white_24dp.png diff --git a/core/src/main/res/drawable-xhdpi/ic_create_new_folder_grey600_24dp.png b/core/src/main/res/drawable-xhdpi/ic_create_new_folder_grey600_24dp.png Binary files differnew file mode 100644 index 000000000..82f0ad458 --- /dev/null +++ b/core/src/main/res/drawable-xhdpi/ic_create_new_folder_grey600_24dp.png diff --git a/core/src/main/res/drawable-xhdpi/ic_create_new_folder_white_24dp.png b/core/src/main/res/drawable-xhdpi/ic_create_new_folder_white_24dp.png Binary files differnew file mode 100644 index 000000000..aa54623c8 --- /dev/null +++ b/core/src/main/res/drawable-xhdpi/ic_create_new_folder_white_24dp.png 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 Binary files differnew file mode 100644 index 000000000..802fc6fa0 --- /dev/null +++ b/core/src/main/res/drawable-xxhdpi/ic_create_new_folder_grey600_24dp.png 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 Binary files differnew file mode 100644 index 000000000..91cbc73d1 --- /dev/null +++ b/core/src/main/res/drawable-xxhdpi/ic_create_new_folder_white_24dp.png 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 Binary files differnew file mode 100644 index 000000000..baf7b6ef7 --- /dev/null +++ b/core/src/main/res/drawable-xxxhdpi/ic_create_new_folder_grey600_24dp.png 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 Binary files differnew file mode 100644 index 000000000..aa103bfd0 --- /dev/null +++ b/core/src/main/res/drawable-xxxhdpi/ic_create_new_folder_white_24dp.png 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 @@ <attr name="ic_indeterminate_check_box" format="reference"/> <attr name="ic_sort" format="reference"/> <attr name="ic_sd_storage" format="reference"/> + <attr name="ic_create_new_folder" format="reference"/> <!-- Used in itemdescription --> <attr name="non_transparent_background" format="reference"/> 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 @@ <item name="attr/ic_indeterminate_check_box">@drawable/ic_indeterminate_check_box_grey600_24dp</item> <item name="attr/ic_sort">@drawable/ic_sort_grey600_24dp</item> <item name="attr/ic_sd_storage">@drawable/ic_sd_storage_grey600_36dp</item> + <item name="attr/ic_create_new_folder">@drawable/ic_create_new_folder_grey600_24dp</item> </style> <style name="Theme.AntennaPod.Dark" parent="Theme.AppCompat"> @@ -116,7 +117,7 @@ <item name="attr/ic_indeterminate_check_box">@drawable/ic_indeterminate_check_box_white_24dp</item> <item name="attr/ic_sort">@drawable/ic_sort_white_24dp</item> <item name="attr/ic_sd_storage">@drawable/ic_sd_storage_white_36dp</item> - + <item name="attr/ic_create_new_folder">@drawable/ic_create_new_folder_white_24dp</item> </style> <style name="Theme.AntennaPod.Light.NoTitle" parent="Theme.AppCompat.Light.NoActionBar"> @@ -177,6 +178,7 @@ <item name="attr/ic_indeterminate_check_box">@drawable/ic_indeterminate_check_box_grey600_24dp</item> <item name="attr/ic_sort">@drawable/ic_sort_grey600_24dp</item> <item name="attr/ic_sd_storage">@drawable/ic_sd_storage_grey600_36dp</item> + <item name="attr/ic_create_new_folder">@drawable/ic_create_new_folder_grey600_24dp</item> </style> <style name="Theme.AntennaPod.Dark.NoTitle" parent="Theme.AppCompat.NoActionBar"> @@ -236,6 +238,7 @@ <item name="attr/ic_indeterminate_check_box">@drawable/ic_indeterminate_check_box_white_24dp</item> <item name="attr/ic_sort">@drawable/ic_sort_white_24dp</item> <item name="attr/ic_sd_storage">@drawable/ic_sd_storage_white_36dp</item> + <item name="attr/ic_create_new_folder">@drawable/ic_create_new_folder_white_24dp</item> </style> <style name="Theme.AntennaPod.VideoPlayer" parent="@style/Theme.AntennaPod.Dark"> |