diff options
author | Andrew Dolgov <[email protected]> | 2019-02-03 20:25:56 +0300 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2019-02-03 20:25:56 +0300 |
commit | 13016e9a6a36eded916bee5db6f06e8406e7766b (patch) | |
tree | c17f93f4dc060799d6944cc77cde2db0fb94e186 /org.fox.ttcomics | |
parent | d53e05335ab2233a79a51e04943fa986b71e2400 (diff) |
allow opening /storage for microsd access
Diffstat (limited to 'org.fox.ttcomics')
7 files changed, 75 insertions, 40 deletions
diff --git a/org.fox.ttcomics/build.gradle b/org.fox.ttcomics/build.gradle index c5ead0b..8d2814a 100755 --- a/org.fox.ttcomics/build.gradle +++ b/org.fox.ttcomics/build.gradle @@ -47,10 +47,10 @@ android { }
dependencies {
- implementation 'com.android.support:support-v4:27.1.0'
- implementation 'com.android.support:appcompat-v7:27.1.0'
- implementation 'com.android.support:cardview-v7:27.1.0'
- implementation 'com.android.support:design:27.1.0'
+ implementation 'com.android.support:support-v4:28.0.0'
+ implementation 'com.android.support:appcompat-v7:28.0.0'
+ implementation 'com.android.support:cardview-v7:28.0.0'
+ implementation 'com.android.support:design:28.0.0'
implementation 'com.shamanland:fab:0.0.8'
implementation 'jp.co.recruit_mp:android-HeaderFooterGridView:0.2.4'
implementation 'com.github.bumptech.glide:glide:3.8.0'
diff --git a/org.fox.ttcomics/org.fox.ttcomics.iml b/org.fox.ttcomics/org.fox.ttcomics.iml index 6bdd44a..394c135 100755 --- a/org.fox.ttcomics/org.fox.ttcomics.iml +++ b/org.fox.ttcomics/org.fox.ttcomics.iml @@ -125,53 +125,69 @@ </content> <orderEntry type="jdk" jdkName="Android API 28 Platform" jdkType="Android SDK" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="library" name="Gradle: com.google.auto.service:auto-service:1.0-rc2@jar" level="project" /> + <orderEntry type="library" name="Gradle: com.android.support:design:28.0.0@aar" level="project" /> <orderEntry type="library" name="Gradle: stencil:stencil:0.3.5@jar" level="project" /> - <orderEntry type="library" name="Gradle: com.google.guava:guava:18.0@jar" level="project" /> - <orderEntry type="library" name="Gradle: android.arch.lifecycle:livedata-core:1.1.0@aar" level="project" /> + <orderEntry type="library" name="Gradle: com.android.support:support-fragment:28.0.0@aar" level="project" /> + <orderEntry type="library" name="Gradle: com.android.support:localbroadcastmanager:28.0.0@aar" level="project" /> <orderEntry type="library" name="Gradle: org.clojure:data.priority-map:0.0.2@jar" level="project" /> - <orderEntry type="library" name="Gradle: android.arch.lifecycle:runtime:1.1.0@aar" level="project" /> - <orderEntry type="library" name="Gradle: android.arch.lifecycle:common:1.1.0@jar" level="project" /> - <orderEntry type="library" name="Gradle: android.arch.lifecycle:viewmodel:1.1.0@aar" level="project" /> + <orderEntry type="library" name="Gradle: com.android.support:animated-vector-drawable:28.0.0@aar" level="project" /> + <orderEntry type="library" name="Gradle: android.arch.lifecycle:viewmodel:1.1.1@aar" level="project" /> + <orderEntry type="library" name="Gradle: com.android.support:loader:28.0.0@aar" level="project" /> + <orderEntry type="library" name="Gradle: android.arch.core:runtime:1.1.1@aar" level="project" /> + <orderEntry type="library" name="Gradle: android.arch.lifecycle:livedata-core:1.1.1@aar" level="project" /> + <orderEntry type="library" name="Gradle: net.rdrei.android.dirchooser:library:3.2@aar" level="project" /> + <orderEntry type="library" name="Gradle: com.android.support:cursoradapter:28.0.0@aar" level="project" /> + <orderEntry type="library" name="Gradle: __local_aars__:C.\Users\fox\Projects\tt-comics\org.fox.ttcomics\libs\nineoldandroids-2.4.0.jar:unspecified@jar" level="project" /> + <orderEntry type="library" name="Gradle: com.ToxicBakery.viewpager.transforms:view-pager-transforms:1.2.32@aar" level="project" /> + <orderEntry type="library" name="Gradle: android.arch.lifecycle:runtime:1.1.1@aar" level="project" /> + <orderEntry type="library" name="Gradle: com.android.support:support-compat:28.0.0@aar" level="project" /> + <orderEntry type="library" name="Gradle: com.gu:option:1.3@jar" level="project" /> + <orderEntry type="library" name="Gradle: com.android.support:cardview-v7:28.0.0@aar" level="project" /> + <orderEntry type="library" name="Gradle: quoin:quoin:0.1.2@jar" level="project" /> + <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-base:15.0.1@aar" level="project" /> + <orderEntry type="library" name="Gradle: jp.co.recruit_mp:android-HeaderFooterGridView:0.2.4@aar" level="project" /> + <orderEntry type="library" name="Gradle: com.android.support:support-vector-drawable:28.0.0@aar" level="project" /> + <orderEntry type="library" name="Gradle: com.android.support:support-core-utils:28.0.0@aar" level="project" /> + <orderEntry type="library" name="Gradle: com.android.support:recyclerview-v7:28.0.0@aar" level="project" /> + <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-tasks:15.0.1@aar" level="project" /> + <orderEntry type="library" name="Gradle: com.android.support:support-annotations:28.0.0@jar" level="project" /> + <orderEntry type="library" name="Gradle: com.android.support:interpolator:28.0.0@aar" level="project" /> + <orderEntry type="library" name="Gradle: com.android.support:transition:28.0.0@aar" level="project" /> + <orderEntry type="library" name="Gradle: android.arch.lifecycle:livedata:1.1.1@aar" level="project" /> + <orderEntry type="library" name="Gradle: org.clojure:clojure:1.7.0@jar" level="project" /> + <orderEntry type="library" name="Gradle: com.android.support:drawerlayout:28.0.0@aar" level="project" /> + <orderEntry type="library" name="Gradle: com.android.support:support-v4:28.0.0@aar" level="project" /> + <orderEntry type="library" name="Gradle: com.google.guava:guava:18.0@jar" level="project" /> + <orderEntry type="library" name="Gradle: com.google.auto.service:auto-service:1.0-rc2@jar" level="project" /> + <orderEntry type="library" name="Gradle: com.android.support:documentfile:28.0.0@aar" level="project" /> <orderEntry type="library" name="Gradle: frankiesardo:icepick:3.2.0@jar" level="project" /> + <orderEntry type="library" name="Gradle: com.android.support:slidingpanelayout:28.0.0@aar" level="project" /> <orderEntry type="library" name="Gradle: scout:scout:0.1.0@jar" level="project" /> + <orderEntry type="library" name="Gradle: com.android.support:appcompat-v7:28.0.0@aar" level="project" /> <orderEntry type="library" name="Gradle: com.github.livefront:bridge:v1.1.2@aar" level="project" /> <orderEntry type="library" name="Gradle: ch.acra:acra:4.9.1@aar" level="project" /> - <orderEntry type="library" name="Gradle: com.android.support:support-media-compat:27.1.0@aar" level="project" /> <orderEntry type="library" name="Gradle: com.github.bumptech.glide:glide:3.8.0@jar" level="project" /> - <orderEntry type="library" name="Gradle: net.rdrei.android.dirchooser:library:3.2@aar" level="project" /> - <orderEntry type="library" name="Gradle: com.android.support:transition:27.1.0@aar" level="project" /> - <orderEntry type="library" name="Gradle: android.arch.core:runtime:1.1.0@aar" level="project" /> - <orderEntry type="library" name="Gradle: com.android.support:recyclerview-v7:27.1.0@aar" level="project" /> - <orderEntry type="library" name="Gradle: com.android.support:support-vector-drawable:27.1.0@aar" level="project" /> - <orderEntry type="library" name="Gradle: com.android.support:support-core-utils:27.1.0@aar" level="project" /> + <orderEntry type="library" name="Gradle: com.android.support:collections:28.0.0@jar" level="project" /> <orderEntry type="library" name="Gradle: frankiesardo:icepick-processor:3.2.0@jar" level="project" /> - <orderEntry type="library" name="Gradle: __local_aars__:C.\Users\fox\Projects\tt-comics\org.fox.ttcomics\libs\nineoldandroids-2.4.0.jar:unspecified@jar" level="project" /> <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-basement:15.0.1@aar" level="project" /> <orderEntry type="library" name="Gradle: com.google.auto:auto-common:0.3@jar" level="project" /> - <orderEntry type="library" name="Gradle: com.android.support:support-annotations:27.1.0@jar" level="project" /> - <orderEntry type="library" name="Gradle: com.ToxicBakery.viewpager.transforms:view-pager-transforms:1.2.32@aar" level="project" /> - <orderEntry type="library" name="Gradle: com.gu:option:1.3@jar" level="project" /> - <orderEntry type="library" name="Gradle: com.android.support:support-v4:27.1.0@aar" level="project" /> - <orderEntry type="library" name="Gradle: quoin:quoin:0.1.2@jar" level="project" /> - <orderEntry type="library" name="Gradle: com.android.support:design:27.1.0@aar" level="project" /> + <orderEntry type="library" name="Gradle: com.android.support:support-core-ui:28.0.0@aar" level="project" /> + <orderEntry type="library" name="Gradle: com.android.support:asynclayoutinflater:28.0.0@aar" level="project" /> + <orderEntry type="library" name="Gradle: com.android.support:print:28.0.0@aar" level="project" /> <orderEntry type="library" name="Gradle: org.clojure:core.cache:0.6.3@jar" level="project" /> + <orderEntry type="library" name="Gradle: android.arch.core:common:1.1.1@jar" level="project" /> + <orderEntry type="library" name="Gradle: com.android.support:versionedparcelable:28.0.0@aar" level="project" /> <orderEntry type="library" name="Gradle: com.shamanland:fab:0.0.8@aar" level="project" /> - <orderEntry type="library" name="Gradle: com.android.support:support-core-ui:27.1.0@aar" level="project" /> - <orderEntry type="library" name="Gradle: com.android.support:animated-vector-drawable:27.1.0@aar" level="project" /> - <orderEntry type="library" name="Gradle: com.android.support:appcompat-v7:27.1.0@aar" level="project" /> <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-auth:15.0.1@aar" level="project" /> <orderEntry type="library" name="Gradle: slingshot:slingshot:0.10.3@jar" level="project" /> + <orderEntry type="library" name="Gradle: com.android.support:viewpager:28.0.0@aar" level="project" /> <orderEntry type="library" name="Gradle: com.nhaarman.listviewanimations:lib-core:3.1.0@aar" level="project" /> - <orderEntry type="library" name="Gradle: com.android.support:support-fragment:27.1.0@aar" level="project" /> - <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-base:15.0.1@aar" level="project" /> - <orderEntry type="library" name="Gradle: jp.co.recruit_mp:android-HeaderFooterGridView:0.2.4@aar" level="project" /> <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-auth-api-phone:15.0.1@aar" level="project" /> - <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-tasks:15.0.1@aar" level="project" /> - <orderEntry type="library" name="Gradle: org.clojure:clojure:1.7.0@jar" level="project" /> - <orderEntry type="library" name="Gradle: android.arch.core:common:1.1.0@jar" level="project" /> + <orderEntry type="library" name="Gradle: android.arch.lifecycle:common:1.1.1@jar" level="project" /> + <orderEntry type="library" name="Gradle: com.android.support:coordinatorlayout:28.0.0@aar" level="project" /> + <orderEntry type="library" name="Gradle: com.android.support:customview:28.0.0@aar" level="project" /> + <orderEntry type="library" name="Gradle: com.android.support:swiperefreshlayout:28.0.0@aar" level="project" /> <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-auth-base:15.0.1@aar" level="project" /> - <orderEntry type="library" name="Gradle: com.android.support:cardview-v7:27.1.0@aar" level="project" /> - <orderEntry type="library" name="Gradle: com.android.support:support-compat:27.1.0@aar" level="project" /> + <orderEntry type="library" name="Gradle: com.android.support:support-media-compat:28.0.0@aar" level="project" /> </component> </module>
\ No newline at end of file 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"
|