diff options
Diffstat (limited to 'org.fox.ttcomics/src')
5 files changed, 24 insertions, 5 deletions
diff --git a/org.fox.ttcomics/src/main/AndroidManifest.xml b/org.fox.ttcomics/src/main/AndroidManifest.xml index eb9c914..076dea1 100755 --- a/org.fox.ttcomics/src/main/AndroidManifest.xml +++ b/org.fox.ttcomics/src/main/AndroidManifest.xml @@ -1,8 +1,8 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="org.fox.ttcomics2"
- android:versionCode="86"
- android:versionName="1.44" >
+ android:versionCode="87"
+ android:versionName="1.45" >
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.INTERNET" />
diff --git a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/PreferencesActivity.java b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/PreferencesActivity.java index 9b474e4..c61d136 100755 --- a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/PreferencesActivity.java +++ b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/PreferencesActivity.java @@ -61,13 +61,13 @@ public class PreferencesActivity extends CommonActivity { super.onActivityResult(requestCode, resultCode, data); } - public void startPicker() { + public void startPicker(String initialDir) { Intent intent = new Intent(PreferencesActivity.this, DirectoryChooserActivity.class); SharedPreferences prefs = PreferenceManager .getDefaultSharedPreferences(getApplicationContext()); - String initialDir = prefs.getString("comics_directory", + if (initialDir == null) initialDir = prefs.getString("comics_directory", Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS).getAbsolutePath()); intent.putExtra(DirectoryChooserActivity.EXTRA_CONFIG, DirectoryChooserConfig.builder() diff --git a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/PreferencesFragment.java b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/PreferencesFragment.java index 457e503..e16871f 100755 --- a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/PreferencesFragment.java +++ b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/PreferencesFragment.java @@ -72,7 +72,18 @@ public class PreferencesFragment extends PreferenceFragment { findPreference("comics_directory").setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
@Override
public boolean onPreferenceClick(Preference preference) {
- ((PreferencesActivity)getActivity()).startPicker();
+ ((PreferencesActivity)getActivity()).startPicker(null);
+ return true;
+ }
+ });
+
+ findPreference("comics_directory").setSummary(prefs.getString("comics_directory",
+ getString(R.string.prefs_comics_directory_summary)));
+
+ findPreference("open_storage_dir").setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
+ @Override
+ public boolean onPreferenceClick(Preference preference) {
+ ((PreferencesActivity)getActivity()).startPicker("/storage");
return true;
}
});
diff --git a/org.fox.ttcomics/src/main/res/values/strings.xml b/org.fox.ttcomics/src/main/res/values/strings.xml index f971ffa..fa1c1a4 100755 --- a/org.fox.ttcomics/src/main/res/values/strings.xml +++ b/org.fox.ttcomics/src/main/res/values/strings.xml @@ -78,4 +78,6 @@ <string name="dialog_close">Close</string> <string name="sync_account_not_set">Not specified</string> <string name="prefs_use_page_transformer">Enable animations</string> + <string name="prefs_open_storage_dir_summary">For MicroSD access.</string> + <string name="prefs_open_storage_dir">Open /storage directory</string> </resources>
\ No newline at end of file diff --git a/org.fox.ttcomics/src/main/res/xml/preferences.xml b/org.fox.ttcomics/src/main/res/xml/preferences.xml index 4cbcb15..67171fc 100755 --- a/org.fox.ttcomics/src/main/res/xml/preferences.xml +++ b/org.fox.ttcomics/src/main/res/xml/preferences.xml @@ -8,6 +8,12 @@ android:summary="@string/prefs_comics_directory_summary"
android:title="@string/prefs_comics_directory" >
</Preference>
+ <Preference
+ android:key="open_storage_dir"
+ android:summary="@string/prefs_open_storage_dir_summary"
+ android:title="@string/prefs_open_storage_dir" >
+ </Preference>
+
<org.fox.ttcomics2.utils.LessBrokenSwitchPreference
android:defaultValue="true"
android:key="enable_fab"
|