6 files changed, 78 insertions, 2 deletions
diff --git a/app/src/main/res/drawable-night/ic_download_24dp.xml b/app/src/main/res/drawable-night/ic_download_24dp.xml
new file mode 100644
index 00000000..eb39e3f3
--- /dev/null
+++ b/app/src/main/res/drawable-night/ic_download_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M13,5v6h1.17L12,13.17 9.83,11L11,11L11,5h2m2,-2L9,3v6L5,9l7,7 7,-7h-4L15,3zM19,18L5,18v2h14v-2z"
+      android:fillColor="#FFFFFF"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_download_24dp.xml b/app/src/main/res/drawable/ic_download_24dp.xml
new file mode 100644
index 00000000..ad852174
--- /dev/null
+++ b/app/src/main/res/drawable/ic_download_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M13,5v6h1.17L12,13.17 9.83,11L11,11L11,5h2m2,-2L9,3v6L5,9l7,7 7,-7h-4L15,3zM19,18L5,18v2h14v-2z"
+      android:fillColor="#000000"/>
+</vector>
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index 38edbb2a..94df20c9 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -160,7 +160,7 @@
         <item>ManropeBold</item>
         <item>Sriracha</item>
     </string-array>
-    
+
     <string-array name="settings_tab_post_type">
         <item>Home</item>
         <item>Popular</item>
@@ -228,9 +228,19 @@
         <item>yyyy.M.d HH:mm</item>
         <item>yyyy.M.d hh:mm a</item>
     </string-array>
-    
+
     <string-array name="settings_number_of_columns_in_post_feed">
         <item>1</item>
         <item>2</item>
     </string-array>
+    <!-- Reply Preference -->
+    <string-array name="reply_entries">
+        <item>Reply</item>
+        <item>Reply to all</item>
+    </string-array>
+
+    <string-array name="reply_values">
+        <item>reply</item>
+        <item>reply_all</item>
+    </string-array>
 </resources>
 \ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f50a431d..5d31c088 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -471,6 +471,10 @@
     <string name="settings_tab_multi_reddit_name">MultiReddit Name (/user/yourusername/m/yourmultiredditname)</string>
     <string name="settings_tab_username">Username (Without u/ prefix)</string>
     <string name="no_developer_easter_egg">There\'s no developer options here</string>
+    <string name="settings_download_location_title">Download Location</string>
+    <string name="settings_image_download_location_title">Image Download Location</string>
+    <string name="settings_gif_download_location_title">Gif Download Location</string>
+    <string name="settings_video_download_location_title">Video Download Location</string>
 
     <string name="no_link_available">Cannot get the link</string>
 
@@ -840,6 +844,18 @@
     <string name="downloading_reddit_video_failed_cannot_save_mux_video">Download failed: cannot save the video to public directory</string>
     <string name="downloading_video">Downloading Video</string>
 
+    <string name="downloading_image">Downloading Image</string>
+    <string name="downloading_gif">Downloading Gif</string>
+    <string name="downloading_image_save_image">Saving Image</string>
+    <string name="downloading_gif_save_gif">Saving Gif</string>
+    <string name="downloading_image_finished">Downloaded</string>
+    <string name="downloading_gif_finished">Downloaded</string>
+    <string name="downloading_image_or_gif_failed_cannot_get_destination_directory">Download failed: cannot access destination directory</string>
+    <string name="downloading_image_failed_cannot_download_image">Download image failed</string>
+    <string name="downloading_image_failed_cannot_save_image">Download failed: cannot save image to destination directory</string>
+    <string name="downloading_gif_failed_cannot_download_gif">Download gif failed</string>
+    <string name="downloading_gif_failed_cannot_save_gif">Download failed: cannot save gif to destination directory</string>
+
     <string name="wallpaper_set">Wallpaper set</string>
     <string name="error_set_wallpaper">Cannot set wallpaper</string>
 
@@ -858,5 +874,19 @@
     <string name="block_user">Block User</string>
     <string name="block_user_success">Blocked</string>
     <string name="block_user_failed">Failed to block user</string>
+    <!-- Preference Titles -->
+    <string name="messages_header">Messages</string>
+    <string name="sync_header">Sync</string>
+
+    <!-- Messages Preferences -->
+    <string name="signature_title">Your signature</string>
+    <string name="reply_title">Default reply action</string>
+
+    <!-- Sync Preferences -->
+    <string name="sync_title">Sync email periodically</string>
+    <string name="attachment_title">Download incoming attachments</string>
+    <string name="attachment_summary_on">Automatically download attachments for incoming emails
+    </string>
+    <string name="attachment_summary_off">Only download attachments when manually requested</string>
 
 </resources>
diff --git a/app/src/main/res/xml/download_location_preferences.xml b/app/src/main/res/xml/download_location_preferences.xml
new file mode 100644
index 00000000..7954cb87
--- /dev/null
+++ b/app/src/main/res/xml/download_location_preferences.xml
@@ -0,0 +1,13 @@
+<PreferenceScreen xmlns:app="http://schemas.android.com/apk/res-auto">
+    <Preference
+        app:key="image_download_location"
+        app:title="@string/settings_image_download_location_title" />
+
+    <Preference
+        app:key="gif_download_location"
+        app:title="@string/settings_gif_download_location_title" />
+
+    <Preference
+        app:key="video_download_location"
+        app:title="@string/settings_video_download_location_title" />
+</PreferenceScreen>
+\ No newline at end of file
diff --git a/app/src/main/res/xml/main_preferences.xml b/app/src/main/res/xml/main_preferences.xml
index 9af72116..ce6ff184 100644
--- a/app/src/main/res/xml/main_preferences.xml
+++ b/app/src/main/res/xml/main_preferences.xml
@@ -36,6 +36,11 @@
         app:title="@string/settings_lazy_mode_interval_title"
         app:useSimpleSummaryProvider="true" />
 
+    <Preference
+        app:title="@string/settings_download_location_title"
+        android:icon="@drawable/ic_download_24dp"
+        app:fragment="ml.docilealligator.infinityforreddit.Settings.DownloadLocationPreferenceFragment" />
+
     <SwitchPreference
         app:defaultValue="false"
         app:key="save_front_page_scrolled_position"