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 000000000..bfe98fd07 Binary files /dev/null and b/core/src/main/res/drawable-hdpi/ic_create_new_folder_grey600_24dp.png differ 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 000000000..a8b0ada87 Binary files /dev/null and b/core/src/main/res/drawable-hdpi/ic_create_new_folder_white_24dp.png differ 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 000000000..eeed34653 Binary files /dev/null and b/core/src/main/res/drawable-mdpi/ic_create_new_folder_grey600_24dp.png differ 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 new file mode 100644 index 000000000..3b9eaa827 Binary files /dev/null and b/core/src/main/res/drawable-mdpi/ic_create_new_folder_white_24dp.png differ 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 new file mode 100644 index 000000000..82f0ad458 Binary files /dev/null and b/core/src/main/res/drawable-xhdpi/ic_create_new_folder_grey600_24dp.png differ 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 new file mode 100644 index 000000000..aa54623c8 Binary files /dev/null and b/core/src/main/res/drawable-xhdpi/ic_create_new_folder_white_24dp.png differ 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 000000000..802fc6fa0 Binary files /dev/null and b/core/src/main/res/drawable-xxhdpi/ic_create_new_folder_grey600_24dp.png differ 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 000000000..91cbc73d1 Binary files /dev/null and b/core/src/main/res/drawable-xxhdpi/ic_create_new_folder_white_24dp.png differ 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 000000000..baf7b6ef7 Binary files /dev/null and b/core/src/main/res/drawable-xxxhdpi/ic_create_new_folder_grey600_24dp.png differ 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 000000000..aa103bfd0 Binary files /dev/null and b/core/src/main/res/drawable-xxxhdpi/ic_create_new_folder_white_24dp.png differ 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