Merge pull request #1639 from mfietz/issue/975-no-external-storage

No external storage / Choose Data Folder redo

23 files changed, 11 insertions, 0 deletions

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
--- /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
new 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-hdpi/ic_sd_storage_grey600_36dp.png b/core/src/main/res/drawable-hdpi/ic_sd_storage_grey600_36dp.png
new file mode 100644
index 000000000..0890b2e5c
--- /dev/null
+++ b/core/src/main/res/drawable-hdpi/ic_sd_storage_grey600_36dp.png
diff --git a/core/src/main/res/drawable-hdpi/ic_sd_storage_white_36dp.png b/core/src/main/res/drawable-hdpi/ic_sd_storage_white_36dp.png
new file mode 100644
index 000000000..d9bfcfbfb
--- /dev/null
+++ b/core/src/main/res/drawable-hdpi/ic_sd_storage_white_36dp.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
new 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
new 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-mdpi/ic_sd_storage_grey600_36dp.png b/core/src/main/res/drawable-mdpi/ic_sd_storage_grey600_36dp.png
new file mode 100644
index 000000000..f0c5ed4c3
--- /dev/null
+++ b/core/src/main/res/drawable-mdpi/ic_sd_storage_grey600_36dp.png
diff --git a/core/src/main/res/drawable-mdpi/ic_sd_storage_white_36dp.png b/core/src/main/res/drawable-mdpi/ic_sd_storage_white_36dp.png
new file mode 100644
index 000000000..6595d2e1e
--- /dev/null
+++ b/core/src/main/res/drawable-mdpi/ic_sd_storage_white_36dp.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
new 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
new 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-xhdpi/ic_sd_storage_grey600_36dp.png b/core/src/main/res/drawable-xhdpi/ic_sd_storage_grey600_36dp.png
new file mode 100644
index 000000000..48cc94622
--- /dev/null
+++ b/core/src/main/res/drawable-xhdpi/ic_sd_storage_grey600_36dp.png
diff --git a/core/src/main/res/drawable-xhdpi/ic_sd_storage_white_36dp.png b/core/src/main/res/drawable-xhdpi/ic_sd_storage_white_36dp.png
new file mode 100644
index 000000000..b440536f6
--- /dev/null
+++ b/core/src/main/res/drawable-xhdpi/ic_sd_storage_white_36dp.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
new 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
new 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-xxhdpi/ic_sd_storage_grey600_36dp.png b/core/src/main/res/drawable-xxhdpi/ic_sd_storage_grey600_36dp.png
new file mode 100644
index 000000000..4352dbc06
--- /dev/null
+++ b/core/src/main/res/drawable-xxhdpi/ic_sd_storage_grey600_36dp.png
diff --git a/core/src/main/res/drawable-xxhdpi/ic_sd_storage_white_36dp.png b/core/src/main/res/drawable-xxhdpi/ic_sd_storage_white_36dp.png
new file mode 100644
index 000000000..5e18ed274
--- /dev/null
+++ b/core/src/main/res/drawable-xxhdpi/ic_sd_storage_white_36dp.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
new 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
new 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/drawable-xxxhdpi/ic_sd_storage_grey600_36dp.png b/core/src/main/res/drawable-xxxhdpi/ic_sd_storage_grey600_36dp.png
new file mode 100644
index 000000000..cf03bc3f1
--- /dev/null
+++ b/core/src/main/res/drawable-xxxhdpi/ic_sd_storage_grey600_36dp.png
diff --git a/core/src/main/res/drawable-xxxhdpi/ic_sd_storage_white_36dp.png b/core/src/main/res/drawable-xxxhdpi/ic_sd_storage_white_36dp.png
new file mode 100644
index 000000000..2996619c9
--- /dev/null
+++ b/core/src/main/res/drawable-xxxhdpi/ic_sd_storage_white_36dp.png
diff --git a/core/src/main/res/values/attrs.xml b/core/src/main/res/values/attrs.xml
index 0eb4d581e..2d3379d95 100644
--- a/core/src/main/res/values/attrs.xml
+++ b/core/src/main/res/values/attrs.xml
@@ -50,6 +50,8 @@
     <attr name="ic_check_box_outline" format="reference"/>
     <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/strings.xml b/core/src/main/res/values/strings.xml
index 7f2599474..912a60f55 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -485,6 +485,7 @@
     <string name="create_folder_label">Create folder</string>
     <string name="choose_data_directory">Choose Data Folder</string>
     <string name="choose_data_directory_message">Please choose the base of your data folder. AntennaPod will create the appropriate sub-directories.</string>
+    <string name="choose_data_directory_permission_rationale">Access to external storage is required to change the data folder</string>
     <string name="create_folder_msg">Create new folder with name "%1$s"?</string>
     <string name="create_folder_success">Created new folder</string>
     <string name="create_folder_error_no_write_access">Cannot write to this folder</string>
diff --git a/core/src/main/res/values/styles.xml b/core/src/main/res/values/styles.xml
index d3718a460..c4a731a53 100644
--- a/core/src/main/res/values/styles.xml
+++ b/core/src/main/res/values/styles.xml
@@ -57,6 +57,8 @@
         <item name="attr/ic_check_box_outline">@drawable/ic_check_box_outline_blank_grey600_24dp</item>
         <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">
@@ -114,6 +116,8 @@
         <item name="attr/ic_check_box_outline">@drawable/ic_check_box_outline_blank_white_24dp</item>
         <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">
@@ -173,6 +177,8 @@
         <item name="attr/ic_check_box_outline">@drawable/ic_check_box_outline_blank_grey600_24dp</item>
         <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">
@@ -231,6 +237,8 @@
         <item name="attr/ic_check_box_outline">@drawable/ic_check_box_outline_blank_white_24dp</item>
         <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">