diff options
author | Andrew Dolgov <[email protected]> | 2015-02-11 12:06:37 +0300 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2015-02-11 12:06:37 +0300 |
commit | 4ed26b8807c5ef83f62d2d08458304999aea0670 (patch) | |
tree | f2fba08226d468569e6c30a139f8603458f55508 | |
parent | 68ae4822e2777ef3d065c18b1c3964cc4d01b486 (diff) |
Revert "rename main module"
This reverts commit 68ae4822e2777ef3d065c18b1c3964cc4d01b486.
-rw-r--r-- | .idea/.name | 2 | ||||
-rwxr-xr-x | .idea/gradle.xml | 4 | ||||
-rw-r--r--[-rwxr-xr-x] | .idea/modules.xml | 3 | ||||
-rwxr-xr-x | org.fox.ttcomics/build.gradle (renamed from app/build.gradle) | 64 | ||||
-rwxr-xr-x | org.fox.ttcomics/libs/universal-image-loader-1.9.3.jar (renamed from app/libs/universal-image-loader-1.9.3.jar) | bin | 160443 -> 160443 bytes | |||
-rwxr-xr-x | org.fox.ttcomics/org.fox.ttcomics.iml (renamed from app/app.iml) | 192 | ||||
-rwxr-xr-x | org.fox.ttcomics/src/main/AndroidManifest.xml (renamed from app/src/main/AndroidManifest.xml) | 118 | ||||
-rw-r--r-- | org.fox.ttcomics/src/main/java/it/sephiroth/android/library/imagezoom/ImageViewTouch.java (renamed from app/src/main/java/it/sephiroth/android/library/imagezoom/ImageViewTouch.java) | 0 | ||||
-rw-r--r-- | org.fox.ttcomics/src/main/java/it/sephiroth/android/library/imagezoom/ImageViewTouchBase.java (renamed from app/src/main/java/it/sephiroth/android/library/imagezoom/ImageViewTouchBase.java) | 0 | ||||
-rw-r--r-- | org.fox.ttcomics/src/main/java/it/sephiroth/android/library/imagezoom/easing/Cubic.java (renamed from app/src/main/java/it/sephiroth/android/library/imagezoom/easing/Cubic.java) | 0 | ||||
-rw-r--r-- | org.fox.ttcomics/src/main/java/it/sephiroth/android/library/imagezoom/easing/Easing.java (renamed from app/src/main/java/it/sephiroth/android/library/imagezoom/easing/Easing.java) | 0 | ||||
-rw-r--r-- | org.fox.ttcomics/src/main/java/it/sephiroth/android/library/imagezoom/graphics/FastBitmapDrawable.java (renamed from app/src/main/java/it/sephiroth/android/library/imagezoom/graphics/FastBitmapDrawable.java) | 0 | ||||
-rw-r--r-- | org.fox.ttcomics/src/main/java/it/sephiroth/android/library/imagezoom/graphics/IBitmapDrawable.java (renamed from app/src/main/java/it/sephiroth/android/library/imagezoom/graphics/IBitmapDrawable.java) | 0 | ||||
-rw-r--r-- | org.fox.ttcomics/src/main/java/it/sephiroth/android/library/imagezoom/utils/IDisposable.java (renamed from app/src/main/java/it/sephiroth/android/library/imagezoom/utils/IDisposable.java) | 0 | ||||
-rw-r--r-- | org.fox.ttcomics/src/main/java/org/fox/ttcomics2/Application.java (renamed from app/src/main/java/org/fox/ttcomics2/Application.java) | 0 | ||||
-rw-r--r-- | org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ByteArrayImageDownloader.java (renamed from app/src/main/java/org/fox/ttcomics2/ByteArrayImageDownloader.java) | 0 | ||||
-rw-r--r-- | org.fox.ttcomics/src/main/java/org/fox/ttcomics2/CbzComicArchive.java (renamed from app/src/main/java/org/fox/ttcomics2/CbzComicArchive.java) | 0 | ||||
-rw-r--r-- | org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ComicArchive.java (renamed from app/src/main/java/org/fox/ttcomics2/ComicArchive.java) | 0 | ||||
-rw-r--r-- | org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ComicFragment.java (renamed from app/src/main/java/org/fox/ttcomics2/ComicFragment.java) | 0 | ||||
-rw-r--r-- | org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ComicListFragment.java (renamed from app/src/main/java/org/fox/ttcomics2/ComicListFragment.java) | 0 | ||||
-rw-r--r-- | org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ComicPager.java (renamed from app/src/main/java/org/fox/ttcomics2/ComicPager.java) | 0 | ||||
-rw-r--r-- | org.fox.ttcomics/src/main/java/org/fox/ttcomics2/CommonActivity.java (renamed from app/src/main/java/org/fox/ttcomics2/CommonActivity.java) | 0 | ||||
-rw-r--r-- | org.fox.ttcomics/src/main/java/org/fox/ttcomics2/DatabaseHelper.java (renamed from app/src/main/java/org/fox/ttcomics2/DatabaseHelper.java) | 0 | ||||
-rw-r--r-- | org.fox.ttcomics/src/main/java/org/fox/ttcomics2/DirectoryPicker.java (renamed from app/src/main/java/org/fox/ttcomics2/DirectoryPicker.java) | 0 | ||||
-rw-r--r-- | org.fox.ttcomics/src/main/java/org/fox/ttcomics2/MainActivity.java (renamed from app/src/main/java/org/fox/ttcomics2/MainActivity.java) | 0 | ||||
-rw-r--r-- | org.fox.ttcomics/src/main/java/org/fox/ttcomics2/NaturalOrderComparator.java (renamed from app/src/main/java/org/fox/ttcomics2/NaturalOrderComparator.java) | 0 | ||||
-rw-r--r-- | org.fox.ttcomics/src/main/java/org/fox/ttcomics2/PreferencesActivity.java (renamed from app/src/main/java/org/fox/ttcomics2/PreferencesActivity.java) | 0 | ||||
-rw-r--r-- | org.fox.ttcomics/src/main/java/org/fox/ttcomics2/SyncClient.java (renamed from app/src/main/java/org/fox/ttcomics2/SyncClient.java) | 0 | ||||
-rw-r--r-- | org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ViewComicActivity.java (renamed from app/src/main/java/org/fox/ttcomics2/ViewComicActivity.java) | 0 | ||||
-rw-r--r-- | org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ViewPager.java (renamed from app/src/main/java/org/fox/ttcomics2/ViewPager.java) | 0 | ||||
-rw-r--r-- | org.fox.ttcomics/src/main/res/anim/appear.xml (renamed from app/src/main/res/anim/appear.xml) | 18 | ||||
-rw-r--r-- | org.fox.ttcomics/src/main/res/drawable-hdpi/badimage.png (renamed from app/src/main/res/drawable-hdpi/badimage.png) | bin | 49285 -> 49285 bytes | |||
-rwxr-xr-x | org.fox.ttcomics/src/main/res/drawable-hdpi/comic_grid_footer.png (renamed from app/src/main/res/drawable-hdpi/comic_grid_footer.png) | bin | 156 -> 156 bytes | |||
-rw-r--r-- | org.fox.ttcomics/src/main/res/drawable-hdpi/ic_action_overflow.png (renamed from app/src/main/res/drawable-hdpi/ic_action_overflow.png) | bin | 225 -> 225 bytes | |||
-rw-r--r-- | org.fox.ttcomics/src/main/res/drawable-hdpi/ic_launcher.png (renamed from app/src/main/res/drawable-hdpi/ic_launcher.png) | bin | 5484 -> 5484 bytes | |||
-rw-r--r-- | org.fox.ttcomics/src/main/res/drawable-hdpi/ic_refresh_light.png (renamed from app/src/main/res/drawable-hdpi/ic_refresh_light.png) | bin | 3138 -> 3138 bytes | |||
-rw-r--r-- | org.fox.ttcomics/src/main/res/drawable-hdpi/ic_settings.png (renamed from app/src/main/res/drawable-hdpi/ic_settings.png) | bin | 1540 -> 1540 bytes | |||
-rw-r--r-- | org.fox.ttcomics/src/main/res/drawable-hdpi/ic_share_light.png (renamed from app/src/main/res/drawable-hdpi/ic_share_light.png) | bin | 1606 -> 1606 bytes | |||
-rw-r--r-- | org.fox.ttcomics/src/main/res/drawable-xhdpi/ic_action_good.png (renamed from app/src/main/res/drawable-xhdpi/ic_action_good.png) | bin | 585 -> 585 bytes | |||
-rw-r--r-- | org.fox.ttcomics/src/main/res/drawable-xhdpi/ic_action_overflow.png (renamed from app/src/main/res/drawable-xhdpi/ic_action_overflow.png) | bin | 280 -> 280 bytes | |||
-rw-r--r-- | org.fox.ttcomics/src/main/res/drawable-xhdpi/ic_launcher.png (renamed from app/src/main/res/drawable-xhdpi/ic_launcher.png) | bin | 7914 -> 7914 bytes | |||
-rw-r--r-- | org.fox.ttcomics/src/main/res/drawable-xhdpi/ic_refresh_light.png (renamed from app/src/main/res/drawable-xhdpi/ic_refresh_light.png) | bin | 3219 -> 3219 bytes | |||
-rw-r--r-- | org.fox.ttcomics/src/main/res/drawable-xhdpi/ic_search_light.png (renamed from app/src/main/res/drawable-xhdpi/ic_search_light.png) | bin | 2127 -> 2127 bytes | |||
-rw-r--r-- | org.fox.ttcomics/src/main/res/drawable-xhdpi/ic_settings.png (renamed from app/src/main/res/drawable-xhdpi/ic_settings.png) | bin | 1641 -> 1641 bytes | |||
-rw-r--r-- | org.fox.ttcomics/src/main/res/drawable-xhdpi/ic_share_light.png (renamed from app/src/main/res/drawable-xhdpi/ic_share_light.png) | bin | 1780 -> 1780 bytes | |||
-rw-r--r-- | org.fox.ttcomics/src/main/res/drawable-xxhdpi/ic_launcher.png (renamed from app/src/main/res/drawable-xxhdpi/ic_launcher.png) | bin | 12808 -> 12808 bytes | |||
-rw-r--r-- | org.fox.ttcomics/src/main/res/drawable/s_badimage.svg (renamed from app/src/main/res/drawable/s_badimage.svg) | 0 | ||||
-rw-r--r-- | org.fox.ttcomics/src/main/res/drawable/s_launcher.svg (renamed from app/src/main/res/drawable/s_launcher.svg) | 0 | ||||
-rwxr-xr-x | org.fox.ttcomics/src/main/res/layout-sw600dp/activity_main.xml (renamed from app/src/main/res/layout-sw600dp/activity_main.xml) | 62 | ||||
-rw-r--r-- | org.fox.ttcomics/src/main/res/layout-sw600dp/activity_view_comic.xml (renamed from app/src/main/res/layout-sw600dp/activity_view_comic.xml) | 38 | ||||
-rwxr-xr-x | org.fox.ttcomics/src/main/res/layout/activity_main.xml (renamed from app/src/main/res/layout/activity_main.xml) | 46 | ||||
-rw-r--r-- | org.fox.ttcomics/src/main/res/layout/activity_view_comic.xml (renamed from app/src/main/res/layout/activity_view_comic.xml) | 24 | ||||
-rw-r--r-- | org.fox.ttcomics/src/main/res/layout/chooser_list.xml (renamed from app/src/main/res/layout/chooser_list.xml) | 64 | ||||
-rwxr-xr-x | org.fox.ttcomics/src/main/res/layout/comics_grid_row.xml (renamed from app/src/main/res/layout/comics_grid_row.xml) | 132 | ||||
-rw-r--r-- | org.fox.ttcomics/src/main/res/layout/dialog_location.xml (renamed from app/src/main/res/layout/dialog_location.xml) | 26 | ||||
-rw-r--r-- | org.fox.ttcomics/src/main/res/layout/fragment_comic.xml (renamed from app/src/main/res/layout/fragment_comic.xml) | 38 | ||||
-rw-r--r-- | org.fox.ttcomics/src/main/res/layout/fragment_comics_list.xml (renamed from app/src/main/res/layout/fragment_comics_list.xml) | 66 | ||||
-rwxr-xr-x | org.fox.ttcomics/src/main/res/layout/fragment_comics_pager.xml (renamed from app/src/main/res/layout/fragment_comics_pager.xml) | 98 | ||||
-rw-r--r-- | org.fox.ttcomics/src/main/res/layout/list_item.xml (renamed from app/src/main/res/layout/list_item.xml) | 12 | ||||
-rw-r--r-- | org.fox.ttcomics/src/main/res/menu/activity_main.xml (renamed from app/src/main/res/menu/activity_main.xml) | 0 | ||||
-rw-r--r-- | org.fox.ttcomics/src/main/res/menu/activity_view_comic.xml (renamed from app/src/main/res/menu/activity_view_comic.xml) | 0 | ||||
-rw-r--r-- | org.fox.ttcomics/src/main/res/menu/comic_archive_context.xml (renamed from app/src/main/res/menu/comic_archive_context.xml) | 0 | ||||
-rw-r--r-- | org.fox.ttcomics/src/main/res/values-large/dimens.xml (renamed from app/src/main/res/values-large/dimens.xml) | 12 | ||||
-rw-r--r-- | org.fox.ttcomics/src/main/res/values-v11/style.xml (renamed from app/src/main/res/values-v11/style.xml) | 0 | ||||
-rw-r--r-- | org.fox.ttcomics/src/main/res/values-v21/style.xml (renamed from app/src/main/res/values-v21/style.xml) | 0 | ||||
-rw-r--r-- | org.fox.ttcomics/src/main/res/values/attrs.xml (renamed from app/src/main/res/values/attrs.xml) | 6 | ||||
-rw-r--r-- | org.fox.ttcomics/src/main/res/values/dimens.xml (renamed from app/src/main/res/values/dimens.xml) | 12 | ||||
-rwxr-xr-x | org.fox.ttcomics/src/main/res/values/strings.xml (renamed from app/src/main/res/values/strings.xml) | 140 | ||||
-rwxr-xr-x | org.fox.ttcomics/src/main/res/values/style.xml (renamed from app/src/main/res/values/style.xml) | 38 | ||||
-rw-r--r-- | org.fox.ttcomics/src/main/res/xml/preferences.xml (renamed from app/src/main/res/xml/preferences.xml) | 130 | ||||
-rw-r--r-- | settings.gradle | 2 | ||||
-rwxr-xr-x | tt-comics.iml | 21 |
72 files changed, 673 insertions, 695 deletions
diff --git a/.idea/.name b/.idea/.name index 5eae97e..0e0a20e 100644 --- a/.idea/.name +++ b/.idea/.name @@ -1 +1 @@ -Pow! Comics Reader
\ No newline at end of file +Tiny-Comics-Reader
\ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 3cede53..48a7928 100755 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -5,11 +5,11 @@ <GradleProjectSettings>
<option name="distributionType" value="LOCAL" />
<option name="externalProjectPath" value="$PROJECT_DIR$" />
- <option name="gradleHome" value="C:\Users\fox\android-studio\gradle\gradle-2.2.1" />
+ <option name="gradleHome" value="C:\Users\Andrew\AppData\Local\Android\android-studio1\gradle\gradle-2.2.1" />
<option name="modules">
<set>
<option value="$PROJECT_DIR$" />
- <option value="$PROJECT_DIR$/app" />
+ <option value="$PROJECT_DIR$/org.fox.ttcomics" />
</set>
</option>
</GradleProjectSettings>
diff --git a/.idea/modules.xml b/.idea/modules.xml index 9481fa5..93796ff 100755..100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -3,8 +3,7 @@ <component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/Tiny-Comics-Reader.iml" filepath="$PROJECT_DIR$/Tiny-Comics-Reader.iml" />
- <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
- <module fileurl="file://$PROJECT_DIR$/tt-comics.iml" filepath="$PROJECT_DIR$/tt-comics.iml" />
+ <module fileurl="file://$PROJECT_DIR$/org.fox.ttcomics/org.fox.ttcomics.iml" filepath="$PROJECT_DIR$/org.fox.ttcomics/org.fox.ttcomics.iml" />
</modules>
</component>
</project>
diff --git a/app/build.gradle b/org.fox.ttcomics/build.gradle index e345145..efa0aa5 100755 --- a/app/build.gradle +++ b/org.fox.ttcomics/build.gradle @@ -1,32 +1,32 @@ -apply plugin: 'com.android.application' - -android { - compileSdkVersion 21 - buildToolsVersion "20.0.0" - - defaultConfig { - applicationId "org.fox.ttcomics2" - minSdkVersion 16 - targetSdkVersion 21 - } - - lintOptions { - abortOnError false - } - - buildTypes { - release { - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt' - } - } -} - -dependencies { - compile 'com.android.support:support-v4:21.0.3' - compile 'com.android.support:appcompat-v7:21.0.3' - compile 'com.android.support:cardview-v7:21.0.3' - compile 'it.neokree:MaterialTabs:0.11' - compile files('libs/universal-image-loader-1.9.3.jar') - compile 'ch.acra:acra:4.5.0' -} +apply plugin: 'com.android.application'
+
+android {
+ compileSdkVersion 21
+ buildToolsVersion "20.0.0"
+
+ defaultConfig {
+ applicationId "org.fox.ttcomics2"
+ minSdkVersion 16
+ targetSdkVersion 21
+ }
+
+ lintOptions {
+ abortOnError false
+ }
+
+ buildTypes {
+ release {
+ minifyEnabled false
+ proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
+ }
+ }
+}
+
+dependencies {
+ compile 'com.android.support:support-v4:21.0.3'
+ compile 'com.android.support:appcompat-v7:21.0.3'
+ compile 'com.android.support:cardview-v7:21.0.3'
+ compile 'it.neokree:MaterialTabs:0.11'
+ compile files('libs/universal-image-loader-1.9.3.jar')
+ compile 'ch.acra:acra:4.5.0'
+}
diff --git a/app/libs/universal-image-loader-1.9.3.jar b/org.fox.ttcomics/libs/universal-image-loader-1.9.3.jar Binary files differindex e8ca33b..e8ca33b 100755 --- a/app/libs/universal-image-loader-1.9.3.jar +++ b/org.fox.ttcomics/libs/universal-image-loader-1.9.3.jar diff --git a/app/app.iml b/org.fox.ttcomics/org.fox.ttcomics.iml index ca07be1..8d03d41 100755 --- a/app/app.iml +++ b/org.fox.ttcomics/org.fox.ttcomics.iml @@ -1,96 +1,96 @@ -<?xml version="1.0" encoding="UTF-8"?> -<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="Tiny-Comics-Reader" external.system.module.version="unspecified" type="JAVA_MODULE" version="4"> - <component name="FacetManager"> - <facet type="android-gradle" name="Android-Gradle"> - <configuration> - <option name="GRADLE_PROJECT_PATH" value=":app" /> - </configuration> - </facet> - <facet type="android" name="Android"> - <configuration> - <option name="SELECTED_BUILD_VARIANT" value="debug" /> - <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" /> - <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" /> - <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugTest" /> - <option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" /> - <option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugTestSources" /> - <option name="ALLOW_USER_CONFIGURATION" value="false" /> - <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" /> - <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" /> - <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res" /> - <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" /> - </configuration> - </facet> - </component> - <component name="NewModuleRootManager" inherit-compiler-output="false"> - <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" /> - <exclude-output /> - <content url="file://$MODULE_DIR$"> - <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" /> - <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" /> - <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" /> - <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" /> - <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" /> - <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/debug" type="java-resource" /> - <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/test/debug" isTestSource="true" generated="true" /> - <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/test/debug" isTestSource="true" generated="true" /> - <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/test/debug" isTestSource="true" generated="true" /> - <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/test/debug" isTestSource="true" generated="true" /> - <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/test/debug" type="java-test-resource" /> - <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/test/debug" type="java-test-resource" /> - <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" /> - <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" /> - <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" /> - <sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" /> - <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" /> - <sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" /> - <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" /> - <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" /> - <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" /> - <sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" /> - <sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" /> - <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" /> - <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" /> - <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" /> - <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" /> - <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" /> - <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" /> - <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" /> - <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" /> - <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" /> - <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" /> - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" /> - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" /> - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" /> - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/coverage-instrumented-classes" /> - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" /> - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" /> - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" /> - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" /> - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" /> - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" /> - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/libs" /> - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" /> - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" /> - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/ndk" /> - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" /> - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard" /> - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" /> - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" /> - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" /> - <excludeFolder url="file://$MODULE_DIR$/build/outputs" /> - <excludeFolder url="file://$MODULE_DIR$/build/tmp" /> - </content> - <orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" /> - <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="library" exported="" name="appcompat-v7-21.0.3" level="project" /> - <orderEntry type="library" exported="" name="support-v4-21.0.3" level="project" /> - <orderEntry type="library" exported="" name="android-ui-1.2" level="project" /> - <orderEntry type="library" exported="" name="support-annotations-21.0.3" level="project" /> - <orderEntry type="library" exported="" name="acra-4.5.0" level="project" /> - <orderEntry type="library" exported="" name="universal-image-loader-1.9.3" level="project" /> - <orderEntry type="library" exported="" name="cardview-v7-21.0.3" level="project" /> - <orderEntry type="library" exported="" name="MaterialTabs-0.11" level="project" /> - </component> -</module> - +<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="Tiny-Comics-Reader" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+ <component name="FacetManager">
+ <facet type="android-gradle" name="Android-Gradle">
+ <configuration>
+ <option name="GRADLE_PROJECT_PATH" value=":org.fox.ttcomics" />
+ </configuration>
+ </facet>
+ <facet type="android" name="Android">
+ <configuration>
+ <option name="SELECTED_BUILD_VARIANT" value="debug" />
+ <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
+ <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
+ <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugTest" />
+ <option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
+ <option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugTestSources" />
+ <option name="ALLOW_USER_CONFIGURATION" value="false" />
+ <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
+ <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
+ <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res" />
+ <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
+ </configuration>
+ </facet>
+ </component>
+ <component name="NewModuleRootManager" inherit-compiler-output="false">
+ <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
+ <exclude-output />
+ <content url="file://$MODULE_DIR$">
+ <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
+ <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
+ <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
+ <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
+ <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
+ <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/debug" type="java-resource" />
+ <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/test/debug" isTestSource="true" generated="true" />
+ <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/test/debug" isTestSource="true" generated="true" />
+ <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/test/debug" isTestSource="true" generated="true" />
+ <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/test/debug" isTestSource="true" generated="true" />
+ <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/test/debug" type="java-test-resource" />
+ <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/test/debug" type="java-test-resource" />
+ <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
+ <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
+ <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
+ <sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
+ <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+ <sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
+ <sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
+ <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
+ <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
+ <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
+ <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
+ <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
+ <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/coverage-instrumented-classes" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/libs" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/ndk" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
+ <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
+ <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
+ </content>
+ <orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="library" exported="" name="appcompat-v7-21.0.3" level="project" />
+ <orderEntry type="library" exported="" name="support-v4-21.0.3" level="project" />
+ <orderEntry type="library" exported="" name="android-ui-1.2" level="project" />
+ <orderEntry type="library" exported="" name="support-annotations-21.0.3" level="project" />
+ <orderEntry type="library" exported="" name="acra-4.5.0" level="project" />
+ <orderEntry type="library" exported="" name="universal-image-loader-1.9.3" level="project" />
+ <orderEntry type="library" exported="" name="cardview-v7-21.0.3" level="project" />
+ <orderEntry type="library" exported="" name="MaterialTabs-0.11" level="project" />
+ </component>
+</module>
+
diff --git a/app/src/main/AndroidManifest.xml b/org.fox.ttcomics/src/main/AndroidManifest.xml index a3fbf2d..2af4fa6 100755 --- a/app/src/main/AndroidManifest.xml +++ b/org.fox.ttcomics/src/main/AndroidManifest.xml @@ -1,60 +1,60 @@ -<manifest xmlns:android="http://schemas.android.com/apk/res/android" - package="org.fox.ttcomics2" - android:versionCode="58" - android:versionName="1.18" > - - <uses-sdk - android:minSdkVersion="16" - android:targetSdkVersion="21" /> - - <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> - <uses-permission android:name="android.permission.GET_ACCOUNTS" /> - <uses-permission android:name="android.permission.INTERNET" /> - - <application - android:name="org.fox.ttcomics2.Application" - android:icon="@drawable/ic_launcher" - android:label="@string/app_name" - android:hardwareAccelerated="true" - android:largeHeap="true" - android:allowBackup="true"> - <activity - android:theme="@style/AppTheme" - android:name=".MainActivity" - android:label="@string/title_activity_main" > - <intent-filter> - <action android:name="android.intent.action.MAIN" /> - - <category android:name="android.intent.category.LAUNCHER" /> - </intent-filter> - </activity> - - <activity - android:name=".PreferencesActivity" - android:label="@string/title_activity_preferences"> - </activity> - - <activity - android:name=".ViewComicActivity" - android:label="@string/title_activity_main"> - </activity> - - <activity - android:name=".CommonActivity" - android:label="@string/title_activity_main"> - </activity> - - <activity - android:name=".DirectoryPicker" - android:label="@string/title_activity_main"> - </activity> - - <activity android:name="org.acra.CrashReportDialog" - android:theme="@style/DarkDialogTheme" - android:launchMode="singleInstance" - android:excludeFromRecents="true" - android:finishOnTaskLaunch="true" /> - - </application> - +<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+ package="org.fox.ttcomics2"
+ android:versionCode="58"
+ android:versionName="1.18" >
+
+ <uses-sdk
+ android:minSdkVersion="16"
+ android:targetSdkVersion="21" />
+
+ <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+ <uses-permission android:name="android.permission.GET_ACCOUNTS" />
+ <uses-permission android:name="android.permission.INTERNET" />
+
+ <application
+ android:name="org.fox.ttcomics2.Application"
+ android:icon="@drawable/ic_launcher"
+ android:label="@string/app_name"
+ android:hardwareAccelerated="true"
+ android:largeHeap="true"
+ android:allowBackup="true">
+ <activity
+ android:theme="@style/AppTheme"
+ android:name=".MainActivity"
+ android:label="@string/title_activity_main" >
+ <intent-filter>
+ <action android:name="android.intent.action.MAIN" />
+
+ <category android:name="android.intent.category.LAUNCHER" />
+ </intent-filter>
+ </activity>
+
+ <activity
+ android:name=".PreferencesActivity"
+ android:label="@string/title_activity_preferences">
+ </activity>
+
+ <activity
+ android:name=".ViewComicActivity"
+ android:label="@string/title_activity_main">
+ </activity>
+
+ <activity
+ android:name=".CommonActivity"
+ android:label="@string/title_activity_main">
+ </activity>
+
+ <activity
+ android:name=".DirectoryPicker"
+ android:label="@string/title_activity_main">
+ </activity>
+
+ <activity android:name="org.acra.CrashReportDialog"
+ android:theme="@style/DarkDialogTheme"
+ android:launchMode="singleInstance"
+ android:excludeFromRecents="true"
+ android:finishOnTaskLaunch="true" />
+
+ </application>
+
</manifest>
\ No newline at end of file diff --git a/app/src/main/java/it/sephiroth/android/library/imagezoom/ImageViewTouch.java b/org.fox.ttcomics/src/main/java/it/sephiroth/android/library/imagezoom/ImageViewTouch.java index 73392b1..73392b1 100644 --- a/app/src/main/java/it/sephiroth/android/library/imagezoom/ImageViewTouch.java +++ b/org.fox.ttcomics/src/main/java/it/sephiroth/android/library/imagezoom/ImageViewTouch.java diff --git a/app/src/main/java/it/sephiroth/android/library/imagezoom/ImageViewTouchBase.java b/org.fox.ttcomics/src/main/java/it/sephiroth/android/library/imagezoom/ImageViewTouchBase.java index 8452a21..8452a21 100644 --- a/app/src/main/java/it/sephiroth/android/library/imagezoom/ImageViewTouchBase.java +++ b/org.fox.ttcomics/src/main/java/it/sephiroth/android/library/imagezoom/ImageViewTouchBase.java diff --git a/app/src/main/java/it/sephiroth/android/library/imagezoom/easing/Cubic.java b/org.fox.ttcomics/src/main/java/it/sephiroth/android/library/imagezoom/easing/Cubic.java index 6f7e87d..6f7e87d 100644 --- a/app/src/main/java/it/sephiroth/android/library/imagezoom/easing/Cubic.java +++ b/org.fox.ttcomics/src/main/java/it/sephiroth/android/library/imagezoom/easing/Cubic.java diff --git a/app/src/main/java/it/sephiroth/android/library/imagezoom/easing/Easing.java b/org.fox.ttcomics/src/main/java/it/sephiroth/android/library/imagezoom/easing/Easing.java index 202e9d9..202e9d9 100644 --- a/app/src/main/java/it/sephiroth/android/library/imagezoom/easing/Easing.java +++ b/org.fox.ttcomics/src/main/java/it/sephiroth/android/library/imagezoom/easing/Easing.java diff --git a/app/src/main/java/it/sephiroth/android/library/imagezoom/graphics/FastBitmapDrawable.java b/org.fox.ttcomics/src/main/java/it/sephiroth/android/library/imagezoom/graphics/FastBitmapDrawable.java index 8afc38e..8afc38e 100644 --- a/app/src/main/java/it/sephiroth/android/library/imagezoom/graphics/FastBitmapDrawable.java +++ b/org.fox.ttcomics/src/main/java/it/sephiroth/android/library/imagezoom/graphics/FastBitmapDrawable.java diff --git a/app/src/main/java/it/sephiroth/android/library/imagezoom/graphics/IBitmapDrawable.java b/org.fox.ttcomics/src/main/java/it/sephiroth/android/library/imagezoom/graphics/IBitmapDrawable.java index 5a2892a..5a2892a 100644 --- a/app/src/main/java/it/sephiroth/android/library/imagezoom/graphics/IBitmapDrawable.java +++ b/org.fox.ttcomics/src/main/java/it/sephiroth/android/library/imagezoom/graphics/IBitmapDrawable.java diff --git a/app/src/main/java/it/sephiroth/android/library/imagezoom/utils/IDisposable.java b/org.fox.ttcomics/src/main/java/it/sephiroth/android/library/imagezoom/utils/IDisposable.java index da991a7..da991a7 100644 --- a/app/src/main/java/it/sephiroth/android/library/imagezoom/utils/IDisposable.java +++ b/org.fox.ttcomics/src/main/java/it/sephiroth/android/library/imagezoom/utils/IDisposable.java diff --git a/app/src/main/java/org/fox/ttcomics2/Application.java b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/Application.java index 8cf7c7a..8cf7c7a 100644 --- a/app/src/main/java/org/fox/ttcomics2/Application.java +++ b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/Application.java diff --git a/app/src/main/java/org/fox/ttcomics2/ByteArrayImageDownloader.java b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ByteArrayImageDownloader.java index 9b7f920..9b7f920 100644 --- a/app/src/main/java/org/fox/ttcomics2/ByteArrayImageDownloader.java +++ b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ByteArrayImageDownloader.java diff --git a/app/src/main/java/org/fox/ttcomics2/CbzComicArchive.java b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/CbzComicArchive.java index e533ff3..e533ff3 100644 --- a/app/src/main/java/org/fox/ttcomics2/CbzComicArchive.java +++ b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/CbzComicArchive.java diff --git a/app/src/main/java/org/fox/ttcomics2/ComicArchive.java b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ComicArchive.java index f85263c..f85263c 100644 --- a/app/src/main/java/org/fox/ttcomics2/ComicArchive.java +++ b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ComicArchive.java diff --git a/app/src/main/java/org/fox/ttcomics2/ComicFragment.java b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ComicFragment.java index 64a88a5..64a88a5 100644 --- a/app/src/main/java/org/fox/ttcomics2/ComicFragment.java +++ b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ComicFragment.java diff --git a/app/src/main/java/org/fox/ttcomics2/ComicListFragment.java b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ComicListFragment.java index 9b766f7..9b766f7 100644 --- a/app/src/main/java/org/fox/ttcomics2/ComicListFragment.java +++ b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ComicListFragment.java diff --git a/app/src/main/java/org/fox/ttcomics2/ComicPager.java b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ComicPager.java index 6ad4a5d..6ad4a5d 100644 --- a/app/src/main/java/org/fox/ttcomics2/ComicPager.java +++ b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ComicPager.java diff --git a/app/src/main/java/org/fox/ttcomics2/CommonActivity.java b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/CommonActivity.java index 2095d87..2095d87 100644 --- a/app/src/main/java/org/fox/ttcomics2/CommonActivity.java +++ b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/CommonActivity.java diff --git a/app/src/main/java/org/fox/ttcomics2/DatabaseHelper.java b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/DatabaseHelper.java index bf66fec..bf66fec 100644 --- a/app/src/main/java/org/fox/ttcomics2/DatabaseHelper.java +++ b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/DatabaseHelper.java diff --git a/app/src/main/java/org/fox/ttcomics2/DirectoryPicker.java b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/DirectoryPicker.java index 0c75f09..0c75f09 100644 --- a/app/src/main/java/org/fox/ttcomics2/DirectoryPicker.java +++ b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/DirectoryPicker.java diff --git a/app/src/main/java/org/fox/ttcomics2/MainActivity.java b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/MainActivity.java index 9dda29b..9dda29b 100644 --- a/app/src/main/java/org/fox/ttcomics2/MainActivity.java +++ b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/MainActivity.java diff --git a/app/src/main/java/org/fox/ttcomics2/NaturalOrderComparator.java b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/NaturalOrderComparator.java index d7522f9..d7522f9 100644 --- a/app/src/main/java/org/fox/ttcomics2/NaturalOrderComparator.java +++ b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/NaturalOrderComparator.java diff --git a/app/src/main/java/org/fox/ttcomics2/PreferencesActivity.java b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/PreferencesActivity.java index f6db9cc..f6db9cc 100644 --- a/app/src/main/java/org/fox/ttcomics2/PreferencesActivity.java +++ b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/PreferencesActivity.java diff --git a/app/src/main/java/org/fox/ttcomics2/SyncClient.java b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/SyncClient.java index 7d4c64a..7d4c64a 100644 --- a/app/src/main/java/org/fox/ttcomics2/SyncClient.java +++ b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/SyncClient.java diff --git a/app/src/main/java/org/fox/ttcomics2/ViewComicActivity.java b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ViewComicActivity.java index abbf835..abbf835 100644 --- a/app/src/main/java/org/fox/ttcomics2/ViewComicActivity.java +++ b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ViewComicActivity.java diff --git a/app/src/main/java/org/fox/ttcomics2/ViewPager.java b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ViewPager.java index 91feea1..91feea1 100644 --- a/app/src/main/java/org/fox/ttcomics2/ViewPager.java +++ b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ViewPager.java diff --git a/app/src/main/res/anim/appear.xml b/org.fox.ttcomics/src/main/res/anim/appear.xml index 9f44552..a60e055 100644 --- a/app/src/main/res/anim/appear.xml +++ b/org.fox.ttcomics/src/main/res/anim/appear.xml @@ -1,9 +1,9 @@ -<?xml version="1.0" encoding="utf-8"?> -<set xmlns:android="http://schemas.android.com/apk/res/android" android:interpolator="@android:anim/accelerate_interpolator"> - <alpha - android:fromAlpha="0" - android:toAlpha="1" - android:duration="150" - /> -</set> - +<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android" android:interpolator="@android:anim/accelerate_interpolator">
+ <alpha
+ android:fromAlpha="0"
+ android:toAlpha="1"
+ android:duration="150"
+ />
+</set>
+
diff --git a/app/src/main/res/drawable-hdpi/badimage.png b/org.fox.ttcomics/src/main/res/drawable-hdpi/badimage.png Binary files differindex 84facc9..84facc9 100644 --- a/app/src/main/res/drawable-hdpi/badimage.png +++ b/org.fox.ttcomics/src/main/res/drawable-hdpi/badimage.png diff --git a/app/src/main/res/drawable-hdpi/comic_grid_footer.png b/org.fox.ttcomics/src/main/res/drawable-hdpi/comic_grid_footer.png Binary files differindex c387044..c387044 100755 --- a/app/src/main/res/drawable-hdpi/comic_grid_footer.png +++ b/org.fox.ttcomics/src/main/res/drawable-hdpi/comic_grid_footer.png diff --git a/app/src/main/res/drawable-hdpi/ic_action_overflow.png b/org.fox.ttcomics/src/main/res/drawable-hdpi/ic_action_overflow.png Binary files differindex 002fc4b..002fc4b 100644 --- a/app/src/main/res/drawable-hdpi/ic_action_overflow.png +++ b/org.fox.ttcomics/src/main/res/drawable-hdpi/ic_action_overflow.png diff --git a/app/src/main/res/drawable-hdpi/ic_launcher.png b/org.fox.ttcomics/src/main/res/drawable-hdpi/ic_launcher.png Binary files differindex e5a62ee..e5a62ee 100644 --- a/app/src/main/res/drawable-hdpi/ic_launcher.png +++ b/org.fox.ttcomics/src/main/res/drawable-hdpi/ic_launcher.png diff --git a/app/src/main/res/drawable-hdpi/ic_refresh_light.png b/org.fox.ttcomics/src/main/res/drawable-hdpi/ic_refresh_light.png Binary files differindex bb9d855..bb9d855 100644 --- a/app/src/main/res/drawable-hdpi/ic_refresh_light.png +++ b/org.fox.ttcomics/src/main/res/drawable-hdpi/ic_refresh_light.png diff --git a/app/src/main/res/drawable-hdpi/ic_settings.png b/org.fox.ttcomics/src/main/res/drawable-hdpi/ic_settings.png Binary files differindex 3e4580e..3e4580e 100644 --- a/app/src/main/res/drawable-hdpi/ic_settings.png +++ b/org.fox.ttcomics/src/main/res/drawable-hdpi/ic_settings.png diff --git a/app/src/main/res/drawable-hdpi/ic_share_light.png b/org.fox.ttcomics/src/main/res/drawable-hdpi/ic_share_light.png Binary files differindex c329f58..c329f58 100644 --- a/app/src/main/res/drawable-hdpi/ic_share_light.png +++ b/org.fox.ttcomics/src/main/res/drawable-hdpi/ic_share_light.png diff --git a/app/src/main/res/drawable-xhdpi/ic_action_good.png b/org.fox.ttcomics/src/main/res/drawable-xhdpi/ic_action_good.png Binary files differindex 49b85ca..49b85ca 100644 --- a/app/src/main/res/drawable-xhdpi/ic_action_good.png +++ b/org.fox.ttcomics/src/main/res/drawable-xhdpi/ic_action_good.png diff --git a/app/src/main/res/drawable-xhdpi/ic_action_overflow.png b/org.fox.ttcomics/src/main/res/drawable-xhdpi/ic_action_overflow.png Binary files differindex cfe1287..cfe1287 100644 --- a/app/src/main/res/drawable-xhdpi/ic_action_overflow.png +++ b/org.fox.ttcomics/src/main/res/drawable-xhdpi/ic_action_overflow.png diff --git a/app/src/main/res/drawable-xhdpi/ic_launcher.png b/org.fox.ttcomics/src/main/res/drawable-xhdpi/ic_launcher.png Binary files differindex 6904f59..6904f59 100644 --- a/app/src/main/res/drawable-xhdpi/ic_launcher.png +++ b/org.fox.ttcomics/src/main/res/drawable-xhdpi/ic_launcher.png diff --git a/app/src/main/res/drawable-xhdpi/ic_refresh_light.png b/org.fox.ttcomics/src/main/res/drawable-xhdpi/ic_refresh_light.png Binary files differindex a7fdc0d..a7fdc0d 100644 --- a/app/src/main/res/drawable-xhdpi/ic_refresh_light.png +++ b/org.fox.ttcomics/src/main/res/drawable-xhdpi/ic_refresh_light.png diff --git a/app/src/main/res/drawable-xhdpi/ic_search_light.png b/org.fox.ttcomics/src/main/res/drawable-xhdpi/ic_search_light.png Binary files differindex 3549f84..3549f84 100644 --- a/app/src/main/res/drawable-xhdpi/ic_search_light.png +++ b/org.fox.ttcomics/src/main/res/drawable-xhdpi/ic_search_light.png diff --git a/app/src/main/res/drawable-xhdpi/ic_settings.png b/org.fox.ttcomics/src/main/res/drawable-xhdpi/ic_settings.png Binary files differindex 09b0148..09b0148 100644 --- a/app/src/main/res/drawable-xhdpi/ic_settings.png +++ b/org.fox.ttcomics/src/main/res/drawable-xhdpi/ic_settings.png diff --git a/app/src/main/res/drawable-xhdpi/ic_share_light.png b/org.fox.ttcomics/src/main/res/drawable-xhdpi/ic_share_light.png Binary files differindex 15549b0..15549b0 100644 --- a/app/src/main/res/drawable-xhdpi/ic_share_light.png +++ b/org.fox.ttcomics/src/main/res/drawable-xhdpi/ic_share_light.png diff --git a/app/src/main/res/drawable-xxhdpi/ic_launcher.png b/org.fox.ttcomics/src/main/res/drawable-xxhdpi/ic_launcher.png Binary files differindex d5f05d2..d5f05d2 100644 --- a/app/src/main/res/drawable-xxhdpi/ic_launcher.png +++ b/org.fox.ttcomics/src/main/res/drawable-xxhdpi/ic_launcher.png diff --git a/app/src/main/res/drawable/s_badimage.svg b/org.fox.ttcomics/src/main/res/drawable/s_badimage.svg index 010d5d1..010d5d1 100644 --- a/app/src/main/res/drawable/s_badimage.svg +++ b/org.fox.ttcomics/src/main/res/drawable/s_badimage.svg diff --git a/app/src/main/res/drawable/s_launcher.svg b/org.fox.ttcomics/src/main/res/drawable/s_launcher.svg index 4b90414..4b90414 100644 --- a/app/src/main/res/drawable/s_launcher.svg +++ b/org.fox.ttcomics/src/main/res/drawable/s_launcher.svg diff --git a/app/src/main/res/layout-sw600dp/activity_main.xml b/org.fox.ttcomics/src/main/res/layout-sw600dp/activity_main.xml index 68170c5..63a7abf 100755 --- a/app/src/main/res/layout-sw600dp/activity_main.xml +++ b/org.fox.ttcomics/src/main/res/layout-sw600dp/activity_main.xml @@ -1,31 +1,31 @@ -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/FrameLayout1" - android:fitsSystemWindows="true" - android:orientation="vertical" - android:layout_width="match_parent" - xmlns:app="http://schemas.android.com/apk/res-auto" - android:layout_height="match_parent"> - - <it.neokree.materialtabs.MaterialTabHost - android:id="@+id/materialTabHost" - android:layout_width="match_parent" - android:layout_height="48dp" - app:textColor="#FFFFFF" - app:primaryColor="#FF6F00" - app:accentColor="#F8CE00" /> - - <FrameLayout - android:id="@+id/comics_list" - android:layout_width="match_parent" - android:layout_height="match_parent" > - - </FrameLayout> - - <TextView - android:id="@+id/tablet_layout_hack" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:visibility="gone" - android:text="" /> - -</LinearLayout> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/FrameLayout1"
+ android:fitsSystemWindows="true"
+ android:orientation="vertical"
+ android:layout_width="match_parent"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ android:layout_height="match_parent">
+
+ <it.neokree.materialtabs.MaterialTabHost
+ android:id="@+id/materialTabHost"
+ android:layout_width="match_parent"
+ android:layout_height="48dp"
+ app:textColor="#FFFFFF"
+ app:primaryColor="#FF6F00"
+ app:accentColor="#F8CE00" />
+
+ <FrameLayout
+ android:id="@+id/comics_list"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent" >
+
+ </FrameLayout>
+
+ <TextView
+ android:id="@+id/tablet_layout_hack"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:visibility="gone"
+ android:text="" />
+
+</LinearLayout>
diff --git a/app/src/main/res/layout-sw600dp/activity_view_comic.xml b/org.fox.ttcomics/src/main/res/layout-sw600dp/activity_view_comic.xml index 01f320b..ba9bbd3 100644 --- a/app/src/main/res/layout-sw600dp/activity_view_comic.xml +++ b/org.fox.ttcomics/src/main/res/layout-sw600dp/activity_view_comic.xml @@ -1,20 +1,20 @@ -<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/FrameLayout2" - android:layout_width="match_parent" - android:layout_height="match_parent"> - - <FrameLayout - android:id="@+id/comics_pager_container" - android:layout_width="match_parent" - android:layout_height="match_parent" > - </FrameLayout> - - - <TextView - android:id="@+id/tablet_layout_hack" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:visibility="gone" - android:text="" /> - +<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/FrameLayout2"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
+
+ <FrameLayout
+ android:id="@+id/comics_pager_container"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent" >
+ </FrameLayout>
+
+
+ <TextView
+ android:id="@+id/tablet_layout_hack"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:visibility="gone"
+ android:text="" />
+
</FrameLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/activity_main.xml b/org.fox.ttcomics/src/main/res/layout/activity_main.xml index 0a6ecd0..0fdd5f0 100755 --- a/app/src/main/res/layout/activity_main.xml +++ b/org.fox.ttcomics/src/main/res/layout/activity_main.xml @@ -1,24 +1,24 @@ -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/FrameLayout1" - android:fitsSystemWindows="true" - android:orientation="vertical" - android:layout_width="match_parent" - xmlns:app="http://schemas.android.com/apk/res-auto" - android:layout_height="match_parent"> - - <it.neokree.materialtabs.MaterialTabHost - android:id="@+id/materialTabHost" - android:layout_width="match_parent" - android:layout_height="48dp" - app:textColor="#FFFFFF" - app:primaryColor="#FF6F00" - app:accentColor="#F8CE00" /> - - <FrameLayout - android:id="@+id/comics_list" - android:layout_width="match_parent" - android:layout_height="match_parent" > - - </FrameLayout> - +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/FrameLayout1"
+ android:fitsSystemWindows="true"
+ android:orientation="vertical"
+ android:layout_width="match_parent"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ android:layout_height="match_parent">
+
+ <it.neokree.materialtabs.MaterialTabHost
+ android:id="@+id/materialTabHost"
+ android:layout_width="match_parent"
+ android:layout_height="48dp"
+ app:textColor="#FFFFFF"
+ app:primaryColor="#FF6F00"
+ app:accentColor="#F8CE00" />
+
+ <FrameLayout
+ android:id="@+id/comics_list"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent" >
+
+ </FrameLayout>
+
</LinearLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/activity_view_comic.xml b/org.fox.ttcomics/src/main/res/layout/activity_view_comic.xml index 8016730..ea696a2 100644 --- a/app/src/main/res/layout/activity_view_comic.xml +++ b/org.fox.ttcomics/src/main/res/layout/activity_view_comic.xml @@ -1,13 +1,13 @@ -<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/FrameLayout2" - android:layout_width="match_parent" - android:layout_height="match_parent"> - - <FrameLayout - android:id="@+id/comics_pager_container" - android:layout_width="match_parent" - android:layout_height="match_parent" > - - </FrameLayout> - +<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/FrameLayout2"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
+
+ <FrameLayout
+ android:id="@+id/comics_pager_container"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent" >
+
+ </FrameLayout>
+
</FrameLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/chooser_list.xml b/org.fox.ttcomics/src/main/res/layout/chooser_list.xml index 4200bc9..f4b4a12 100644 --- a/app/src/main/res/layout/chooser_list.xml +++ b/org.fox.ttcomics/src/main/res/layout/chooser_list.xml @@ -1,33 +1,33 @@ -<?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:orientation="vertical" > - - <ListView - android:id="@android:id/list" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:layout_weight="1" /> - - <LinearLayout - android:id="@+id/linearLayout2" - android:layout_width="fill_parent" - android:layout_height="wrap_content" > - - <Button - android:id="@+id/btnParent" - android:layout_width="fill_parent" - android:layout_weight="1" - android:layout_height="wrap_content" - android:text="@string/open_parent" /> - - <Button - android:id="@+id/btnChoose" - android:layout_weight="1" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:text="@string/choose" /> - </LinearLayout> - +<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent"
+ android:orientation="vertical" >
+
+ <ListView
+ android:id="@android:id/list"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent"
+ android:layout_weight="1" />
+
+ <LinearLayout
+ android:id="@+id/linearLayout2"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content" >
+
+ <Button
+ android:id="@+id/btnParent"
+ android:layout_width="fill_parent"
+ android:layout_weight="1"
+ android:layout_height="wrap_content"
+ android:text="@string/open_parent" />
+
+ <Button
+ android:id="@+id/btnChoose"
+ android:layout_weight="1"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:text="@string/choose" />
+ </LinearLayout>
+
</LinearLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/comics_grid_row.xml b/org.fox.ttcomics/src/main/res/layout/comics_grid_row.xml index 10f1ed4..91d27cd 100755 --- a/app/src/main/res/layout/comics_grid_row.xml +++ b/org.fox.ttcomics/src/main/res/layout/comics_grid_row.xml @@ -1,67 +1,67 @@ -<?xml version="1.0" encoding="utf-8"?> -<android.support.v7.widget.CardView - xmlns:card_view="http://schemas.android.com/apk/res-auto" - xmlns:tools="http://schemas.android.com/tools" - xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/comics_list_row" - android:layout_width="160dp" - android:layout_height="210dp" - android:gravity="center_vertical" - card_view:cardUseCompatPadding="true" - card_view:cardElevation="2dp" - tools:ignore="HardcodedText" > - - <FrameLayout - android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_gravity="center_horizontal" - android:layout_weight="0" - android:padding="0dp" > - - <ImageView - android:layout_width="match_parent" - android:layout_height="200dp" - android:id="@+id/thumbnail" - android:scaleType="centerCrop" - android:src="@drawable/badimage" /> - - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_gravity="bottom|center_horizontal" - android:gravity="center_horizontal|bottom" - android:background="@drawable/comic_grid_footer" - android:padding="4dp" - android:orientation="vertical" > - - <TextView - android:id="@+id/file_name" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_weight="1" - android:ellipsize="middle" - android:singleLine="true" - android:text="Comic_1980.cbz" - android:textColor="@android:color/primary_text_dark" - android:textSize="11sp" /> - - <ProgressBar - android:id="@+id/file_progress_bar" - style="?android:attr/progressBarStyleHorizontal" - android:layout_width="96dp" - android:layout_height="wrap_content" - android:layout_weight="1" /> - - <TextView - android:id="@+id/file_progress_info" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textColor="@android:color/primary_text_dark" - android:layout_weight="0" - android:gravity="right" - android:text="12 of 325" - android:textSize="8sp" /> - </LinearLayout> - - </FrameLayout> +<?xml version="1.0" encoding="utf-8"?>
+<android.support.v7.widget.CardView
+ xmlns:card_view="http://schemas.android.com/apk/res-auto"
+ xmlns:tools="http://schemas.android.com/tools"
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/comics_list_row"
+ android:layout_width="160dp"
+ android:layout_height="210dp"
+ android:gravity="center_vertical"
+ card_view:cardUseCompatPadding="true"
+ card_view:cardElevation="2dp"
+ tools:ignore="HardcodedText" >
+
+ <FrameLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_gravity="center_horizontal"
+ android:layout_weight="0"
+ android:padding="0dp" >
+
+ <ImageView
+ android:layout_width="match_parent"
+ android:layout_height="200dp"
+ android:id="@+id/thumbnail"
+ android:scaleType="centerCrop"
+ android:src="@drawable/badimage" />
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_gravity="bottom|center_horizontal"
+ android:gravity="center_horizontal|bottom"
+ android:background="@drawable/comic_grid_footer"
+ android:padding="4dp"
+ android:orientation="vertical" >
+
+ <TextView
+ android:id="@+id/file_name"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:ellipsize="middle"
+ android:singleLine="true"
+ android:text="Comic_1980.cbz"
+ android:textColor="@android:color/primary_text_dark"
+ android:textSize="11sp" />
+
+ <ProgressBar
+ android:id="@+id/file_progress_bar"
+ style="?android:attr/progressBarStyleHorizontal"
+ android:layout_width="96dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1" />
+
+ <TextView
+ android:id="@+id/file_progress_info"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textColor="@android:color/primary_text_dark"
+ android:layout_weight="0"
+ android:gravity="right"
+ android:text="12 of 325"
+ android:textSize="8sp" />
+ </LinearLayout>
+
+ </FrameLayout>
</android.support.v7.widget.CardView>
\ No newline at end of file diff --git a/app/src/main/res/layout/dialog_location.xml b/org.fox.ttcomics/src/main/res/layout/dialog_location.xml index 4b946d3..cabbf9a 100644 --- a/app/src/main/res/layout/dialog_location.xml +++ b/org.fox.ttcomics/src/main/res/layout/dialog_location.xml @@ -1,14 +1,14 @@ -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/linearLayout1" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="vertical" > - - - - <NumberPicker - android:id="@+id/number_picker" - android:layout_width="match_parent" - android:layout_height="wrap_content" /> - +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/linearLayout1"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical" >
+ + +
+ <NumberPicker
+ android:id="@+id/number_picker"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content" />
+
</LinearLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/fragment_comic.xml b/org.fox.ttcomics/src/main/res/layout/fragment_comic.xml index 59103d4..c9dbbfc 100644 --- a/app/src/main/res/layout/fragment_comic.xml +++ b/org.fox.ttcomics/src/main/res/layout/fragment_comic.xml @@ -1,20 +1,20 @@ -<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/FrameLayout3" - android:layout_width="fill_parent" - android:layout_height="fill_parent"> - - <it.sephiroth.android.library.imagezoom.ImageViewTouch - android:id="@+id/comic_image" - android:layout_width="match_parent" - android:layout_height="match_parent" /> - - <!-- <TextView - android:id="@+id/comic_page" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="bottom|right" - android:layout_margin="4dp" - android:alpha="0.25" - android:text="25" /> --> - +<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/FrameLayout3"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent">
+
+ <it.sephiroth.android.library.imagezoom.ImageViewTouch
+ android:id="@+id/comic_image"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent" />
+
+ <!-- <TextView
+ android:id="@+id/comic_page"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="bottom|right"
+ android:layout_margin="4dp"
+ android:alpha="0.25"
+ android:text="25" /> -->
+
</FrameLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/fragment_comics_list.xml b/org.fox.ttcomics/src/main/res/layout/fragment_comics_list.xml index 5037747..7c7a8b5 100644 --- a/app/src/main/res/layout/fragment_comics_list.xml +++ b/org.fox.ttcomics/src/main/res/layout/fragment_comics_list.xml @@ -1,34 +1,34 @@ -<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/FrameLayout4" - android:layout_width="fill_parent" - android:layout_height="fill_parent"> - - <android.support.v4.widget.SwipeRefreshLayout - android:id="@+id/comics_swipe_container" - android:layout_width="match_parent" - android:layout_height="match_parent" > - <GridView - android:id="@+id/comics_grid" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:columnWidth="160dp" - android:numColumns="auto_fit" > - </GridView> - </android.support.v4.widget.SwipeRefreshLayout> - - <LinearLayout - android:id="@+id/no_comics" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_gravity="center" - android:orientation="vertical" > - - <TextView - android:id="@+id/textView1" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center" - android:text="@string/error_no_comic_archives_found_" /> - </LinearLayout> - +<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/FrameLayout4"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent">
+
+ <android.support.v4.widget.SwipeRefreshLayout
+ android:id="@+id/comics_swipe_container"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent" >
+ <GridView
+ android:id="@+id/comics_grid"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:columnWidth="160dp"
+ android:numColumns="auto_fit" >
+ </GridView>
+ </android.support.v4.widget.SwipeRefreshLayout>
+
+ <LinearLayout
+ android:id="@+id/no_comics"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_gravity="center"
+ android:orientation="vertical" >
+
+ <TextView
+ android:id="@+id/textView1"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"
+ android:text="@string/error_no_comic_archives_found_" />
+ </LinearLayout>
+
</FrameLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/fragment_comics_pager.xml b/org.fox.ttcomics/src/main/res/layout/fragment_comics_pager.xml index fa5ebef..3ac2f7b 100755 --- a/app/src/main/res/layout/fragment_comics_pager.xml +++ b/org.fox.ttcomics/src/main/res/layout/fragment_comics_pager.xml @@ -1,50 +1,50 @@ -<?xml version="1.0" encoding="utf-8"?> -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" -android:id="@+id/comics_pager_container" -android:layout_width="fill_parent" -android:layout_height="fill_parent" > - - <org.fox.ttcomics2.ViewPager - xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:id="@+id/comics_pager" - android:layout_above="@+id/comics_seek_bar" /> - - <SeekBar - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:id="@+id/comics_seek_bar" - android:layout_alignParentBottom="true" - android:layout_toRightOf="@+id/comics_page" - android:layout_toLeftOf="@+id/comics_total_pages" - android:layout_toStartOf="@+id/comics_total_pages" /> - - <TextView - android:layout_width="60dp" - android:layout_height="wrap_content" - android:textAppearance="?android:attr/textAppearanceSmall" - android:text="1123" - android:id="@+id/comics_total_pages" - android:layout_alignParentBottom="true" - android:layout_alignParentRight="true" - android:layout_alignParentEnd="true" - android:singleLine="true" - android:layout_alignTop="@+id/comics_seek_bar" - android:gravity="center" /> - - <TextView - android:layout_width="60dp" - android:layout_height="wrap_content" - android:textAppearance="?android:attr/textAppearanceSmall" - android:text="1" - android:id="@+id/comics_page" - android:singleLine="true" - android:gravity="center" - android:layout_below="@+id/comics_pager" - android:layout_alignParentLeft="true" - android:layout_alignParentStart="true" - android:layout_alignParentBottom="true" /> - - +<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+android:id="@+id/comics_pager_container"
+android:layout_width="fill_parent"
+android:layout_height="fill_parent" >
+
+ <org.fox.ttcomics2.ViewPager
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent"
+ android:id="@+id/comics_pager"
+ android:layout_above="@+id/comics_seek_bar" />
+
+ <SeekBar
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:id="@+id/comics_seek_bar"
+ android:layout_alignParentBottom="true"
+ android:layout_toRightOf="@+id/comics_page"
+ android:layout_toLeftOf="@+id/comics_total_pages"
+ android:layout_toStartOf="@+id/comics_total_pages" />
+
+ <TextView
+ android:layout_width="60dp"
+ android:layout_height="wrap_content"
+ android:textAppearance="?android:attr/textAppearanceSmall"
+ android:text="1123"
+ android:id="@+id/comics_total_pages"
+ android:layout_alignParentBottom="true"
+ android:layout_alignParentRight="true"
+ android:layout_alignParentEnd="true"
+ android:singleLine="true"
+ android:layout_alignTop="@+id/comics_seek_bar"
+ android:gravity="center" />
+
+ <TextView
+ android:layout_width="60dp"
+ android:layout_height="wrap_content"
+ android:textAppearance="?android:attr/textAppearanceSmall"
+ android:text="1"
+ android:id="@+id/comics_page"
+ android:singleLine="true"
+ android:gravity="center"
+ android:layout_below="@+id/comics_pager"
+ android:layout_alignParentLeft="true"
+ android:layout_alignParentStart="true"
+ android:layout_alignParentBottom="true" />
+
+
</RelativeLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/list_item.xml b/org.fox.ttcomics/src/main/res/layout/list_item.xml index f0958d6..1fb2f8c 100644 --- a/app/src/main/res/layout/list_item.xml +++ b/org.fox.ttcomics/src/main/res/layout/list_item.xml @@ -1,7 +1,7 @@ -<?xml version="1.0" encoding="utf-8"?> -<TextView xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:padding="10dp" - android:textSize="16sp" > +<?xml version="1.0" encoding="utf-8"?>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent"
+ android:padding="10dp"
+ android:textSize="16sp" >
</TextView>
\ No newline at end of file diff --git a/app/src/main/res/menu/activity_main.xml b/org.fox.ttcomics/src/main/res/menu/activity_main.xml index a7ca037..a7ca037 100644 --- a/app/src/main/res/menu/activity_main.xml +++ b/org.fox.ttcomics/src/main/res/menu/activity_main.xml diff --git a/app/src/main/res/menu/activity_view_comic.xml b/org.fox.ttcomics/src/main/res/menu/activity_view_comic.xml index 1e5fc29..1e5fc29 100644 --- a/app/src/main/res/menu/activity_view_comic.xml +++ b/org.fox.ttcomics/src/main/res/menu/activity_view_comic.xml diff --git a/app/src/main/res/menu/comic_archive_context.xml b/org.fox.ttcomics/src/main/res/menu/comic_archive_context.xml index 9a39898..9a39898 100644 --- a/app/src/main/res/menu/comic_archive_context.xml +++ b/org.fox.ttcomics/src/main/res/menu/comic_archive_context.xml diff --git a/app/src/main/res/values-large/dimens.xml b/org.fox.ttcomics/src/main/res/values-large/dimens.xml index 5c4a502..1ae597c 100644 --- a/app/src/main/res/values-large/dimens.xml +++ b/org.fox.ttcomics/src/main/res/values-large/dimens.xml @@ -1,7 +1,7 @@ -<resources> - - <dimen name="padding_small">8dp</dimen> - <dimen name="padding_medium">16dp</dimen> - <dimen name="padding_large">16dp</dimen> - +<resources>
+
+ <dimen name="padding_small">8dp</dimen>
+ <dimen name="padding_medium">16dp</dimen>
+ <dimen name="padding_large">16dp</dimen>
+
</resources>
\ No newline at end of file diff --git a/app/src/main/res/values-v11/style.xml b/org.fox.ttcomics/src/main/res/values-v11/style.xml index 54a7530..54a7530 100644 --- a/app/src/main/res/values-v11/style.xml +++ b/org.fox.ttcomics/src/main/res/values-v11/style.xml diff --git a/app/src/main/res/values-v21/style.xml b/org.fox.ttcomics/src/main/res/values-v21/style.xml index c3ac29a..c3ac29a 100644 --- a/app/src/main/res/values-v21/style.xml +++ b/org.fox.ttcomics/src/main/res/values-v21/style.xml diff --git a/app/src/main/res/values/attrs.xml b/org.fox.ttcomics/src/main/res/values/attrs.xml index 0d2c4cc..35c14ff 100644 --- a/app/src/main/res/values/attrs.xml +++ b/org.fox.ttcomics/src/main/res/values/attrs.xml @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> -<resources> - +<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
</resources>
\ No newline at end of file diff --git a/app/src/main/res/values/dimens.xml b/org.fox.ttcomics/src/main/res/values/dimens.xml index ec96646..1dc0322 100644 --- a/app/src/main/res/values/dimens.xml +++ b/org.fox.ttcomics/src/main/res/values/dimens.xml @@ -1,7 +1,7 @@ -<resources> - - <dimen name="padding_small">8dp</dimen> - <dimen name="padding_medium">8dp</dimen> - <dimen name="padding_large">16dp</dimen> - +<resources>
+
+ <dimen name="padding_small">8dp</dimen>
+ <dimen name="padding_medium">8dp</dimen>
+ <dimen name="padding_large">16dp</dimen>
+
</resources>
\ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/org.fox.ttcomics/src/main/res/values/strings.xml index baf00e5..c626d44 100755 --- a/app/src/main/res/values/strings.xml +++ b/org.fox.ttcomics/src/main/res/values/strings.xml @@ -1,71 +1,71 @@ -<resources> - - <string name="app_name">Pow! Comics Reader</string> - <string name="hello_world">Hello world!</string> - <string name="menu_settings">Settings</string> - <string name="menu_go_location">Go to</string> - <string name="title_activity_main">Comics Reader</string> - <string name="title_activity_preferences">Settings</string> - <string name="prefs_comics_directory">Comics directory</string> - <string name="prefs_general">General</string> - <!-- <string name="prefs_dim_status_bar">Dim status bar</string> --> - <string name="file_progress_info">%1$d of %2$d (%3$d%%)</string> - <string name="menu_rescan">Reload</string> - <string name="tab_all_comics">All comics</string> - <string name="tab_unread">Unread</string> - <string name="tab_read">Finished</string> - <string name="dialog_need_prefs_message">Please configure base directory for comics archives.</string> - <string name="dialog_need_prefs_preferences">Settings</string> - <string name="cancel">Cancel</string> - <string name="comics_directory_default">/mnt/sdcard/Comics</string> - <string name="prefs_reading">Reading</string> - <string name="prefs_dark_theme">Dark theme</string> - <string name="dialog_open_location">Open location</string> - <string name="dialog_location_beginning">Beginning</string> - <string name="dialog_location_furthest">Furthest read location</string> - <string name="dialog_location_location">Location…</string> - <string name="dialog_location_end">End</string> - <string name="tab_unfinished">Unfinished</string> - <string name="menu_share">Share</string> - <string name="prefs_use_full_screen">Fullscreen mode</string> - <string name="error_could_not_prepare_file_for_sharing">Could not prepare file for sharing</string> - <string name="error_could_not_open_comic_archive">Could not open comic archive.</string> - <string name="error_out_of_memory">Out of memory</string> - <string name="error_loading_image">Error loading image</string> - <string name="error_could_not_read_folder_contents_">Could not read folder contents.</string> - <string name="picker_choose">Choose %1$s</string> - <string name="sync_server_has_further_page">You are currently on page %1$d. Furthest read page stored on the server is %2$d. Open it instead?</string> - <string name="dialog_open_page">Open page</string> - <string name="menu_sync_location">Sync to last page read</string> - <string name="share_comic">Share comic</string> - <string name="choose">Choose</string> - <string name="error_no_comic_archives_found_">No comic archives found.</string> - <string name="prefs_use_position_sync">Sync last read pages</string> - <string name="prefs_use_position_sync_summary">Requires at least one Google account on the device. No personally identifiable information is sent.</string> - <string name="error_sync_no_account">No Google account found, sync disabled.</string> - <string name="sync_uploading">Uploading sync data…</string> - <string name="error_sync_no_data">No information stored or you are on the furthest read page.</string> - <string name="dialog_clear_data">Clear data</string> - <string name="dialog_clear_data_title">Clear all remotely stored sync data?</string> - <string name="prefs_sync">Sync</string> - <string name="prefs_clear_sync_data">Clear sync data</string> - <string name="prefs_clear_sync_data_summary">Removes all remotely stored sync data.</string> - <string name="open_parent">Open parent</string> - <string name="file_unread">Unread (%1$d pages)</string> - <string name="file_finished">Finished</string> - <string name="menu_toggle_orientation_lock">(Un)lock orientation</string> - <string name="prefs_comics_directory_summary">Base directory for comic archives.</string> - <string name="prefs_fit_to_width">Fit to width</string> - <string name="sync_running_in_test_mode">Sync running in test mode.</string> - <string name="reset_remove_synced_progress">Would you like to remove synced progress too?</string> - <string name="error_cant_open_file">Can\'t open file: %1$s</string> - <string name="prefs_prevent_screen_sleep">Keep screen awake</string> - <string name="error_other_error">Error: unknown error (see log)</string> - <string name="list_type_directory">Directory</string> - <string name="list_type_unknown">Unknown</string> - <string name="prefs_version">%1$s (%2$d)</string> - <string name="prefs_version_title">Version</string> - <string name="prefs_build_timestamp">%1$s</string> - <string name="prefs_build_timestamp_title">Build timestamp</string> - <string name="crash_dialog_text">Unfortunately, Pow! Comics Reader has stopped. Submit crash report to tt-rss.org?</string> +<resources>
+
+ <string name="app_name">Pow! Comics Reader</string>
+ <string name="hello_world">Hello world!</string>
+ <string name="menu_settings">Settings</string>
+ <string name="menu_go_location">Go to</string>
+ <string name="title_activity_main">Comics Reader</string>
+ <string name="title_activity_preferences">Settings</string>
+ <string name="prefs_comics_directory">Comics directory</string>
+ <string name="prefs_general">General</string>
+ <!-- <string name="prefs_dim_status_bar">Dim status bar</string> -->
+ <string name="file_progress_info">%1$d of %2$d (%3$d%%)</string>
+ <string name="menu_rescan">Reload</string>
+ <string name="tab_all_comics">All comics</string>
+ <string name="tab_unread">Unread</string>
+ <string name="tab_read">Finished</string>
+ <string name="dialog_need_prefs_message">Please configure base directory for comics archives.</string>
+ <string name="dialog_need_prefs_preferences">Settings</string>
+ <string name="cancel">Cancel</string>
+ <string name="comics_directory_default">/mnt/sdcard/Comics</string>
+ <string name="prefs_reading">Reading</string>
+ <string name="prefs_dark_theme">Dark theme</string>
+ <string name="dialog_open_location">Open location</string>
+ <string name="dialog_location_beginning">Beginning</string>
+ <string name="dialog_location_furthest">Furthest read location</string>
+ <string name="dialog_location_location">Location…</string>
+ <string name="dialog_location_end">End</string>
+ <string name="tab_unfinished">Unfinished</string>
+ <string name="menu_share">Share</string>
+ <string name="prefs_use_full_screen">Fullscreen mode</string>
+ <string name="error_could_not_prepare_file_for_sharing">Could not prepare file for sharing</string>
+ <string name="error_could_not_open_comic_archive">Could not open comic archive.</string>
+ <string name="error_out_of_memory">Out of memory</string>
+ <string name="error_loading_image">Error loading image</string>
+ <string name="error_could_not_read_folder_contents_">Could not read folder contents.</string>
+ <string name="picker_choose">Choose %1$s</string>
+ <string name="sync_server_has_further_page">You are currently on page %1$d. Furthest read page stored on the server is %2$d. Open it instead?</string>
+ <string name="dialog_open_page">Open page</string>
+ <string name="menu_sync_location">Sync to last page read</string>
+ <string name="share_comic">Share comic</string>
+ <string name="choose">Choose</string>
+ <string name="error_no_comic_archives_found_">No comic archives found.</string>
+ <string name="prefs_use_position_sync">Sync last read pages</string>
+ <string name="prefs_use_position_sync_summary">Requires at least one Google account on the device. No personally identifiable information is sent.</string>
+ <string name="error_sync_no_account">No Google account found, sync disabled.</string>
+ <string name="sync_uploading">Uploading sync data…</string>
+ <string name="error_sync_no_data">No information stored or you are on the furthest read page.</string>
+ <string name="dialog_clear_data">Clear data</string>
+ <string name="dialog_clear_data_title">Clear all remotely stored sync data?</string>
+ <string name="prefs_sync">Sync</string>
+ <string name="prefs_clear_sync_data">Clear sync data</string>
+ <string name="prefs_clear_sync_data_summary">Removes all remotely stored sync data.</string>
+ <string name="open_parent">Open parent</string>
+ <string name="file_unread">Unread (%1$d pages)</string>
+ <string name="file_finished">Finished</string>
+ <string name="menu_toggle_orientation_lock">(Un)lock orientation</string>
+ <string name="prefs_comics_directory_summary">Base directory for comic archives.</string>
+ <string name="prefs_fit_to_width">Fit to width</string>
+ <string name="sync_running_in_test_mode">Sync running in test mode.</string>
+ <string name="reset_remove_synced_progress">Would you like to remove synced progress too?</string>
+ <string name="error_cant_open_file">Can\'t open file: %1$s</string>
+ <string name="prefs_prevent_screen_sleep">Keep screen awake</string>
+ <string name="error_other_error">Error: unknown error (see log)</string>
+ <string name="list_type_directory">Directory</string>
+ <string name="list_type_unknown">Unknown</string>
+ <string name="prefs_version">%1$s (%2$d)</string>
+ <string name="prefs_version_title">Version</string>
+ <string name="prefs_build_timestamp">%1$s</string>
+ <string name="prefs_build_timestamp_title">Build timestamp</string>
+ <string name="crash_dialog_text">Unfortunately, Pow! Comics Reader has stopped. Submit crash report to tt-rss.org?</string>
</resources>
\ No newline at end of file diff --git a/app/src/main/res/values/style.xml b/org.fox.ttcomics/src/main/res/values/style.xml index 6852e4a..92d0730 100755 --- a/app/src/main/res/values/style.xml +++ b/org.fox.ttcomics/src/main/res/values/style.xml @@ -1,20 +1,20 @@ -<resources> - - <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar"> - <item name="colorPrimary">#FF0000</item> - <item name="colorPrimaryDark">#990000</item> - <item name="colorAccent">#FF7500</item> - </style> - - <style name="ViewLightTheme" parent="AppTheme"> - - </style> - - <style name="ViewDarkTheme" parent="Theme.AppCompat"> - <item name="colorPrimary">#600000</item> - <item name="colorPrimaryDark">#300000</item> - <item name="colorAccent">#FF6600</item> - </style> - - <style name="DarkDialogTheme" parent="android:Theme"></style> +<resources>
+
+ <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+ <item name="colorPrimary">#FF0000</item>
+ <item name="colorPrimaryDark">#990000</item>
+ <item name="colorAccent">#FF7500</item>
+ </style>
+
+ <style name="ViewLightTheme" parent="AppTheme">
+
+ </style>
+
+ <style name="ViewDarkTheme" parent="Theme.AppCompat">
+ <item name="colorPrimary">#600000</item>
+ <item name="colorPrimaryDark">#300000</item>
+ <item name="colorAccent">#FF6600</item>
+ </style>
+
+ <style name="DarkDialogTheme" parent="android:Theme"></style>
</resources>
\ No newline at end of file diff --git a/app/src/main/res/xml/preferences.xml b/org.fox.ttcomics/src/main/res/xml/preferences.xml index 7ed6cb2..6f90c16 100644 --- a/app/src/main/res/xml/preferences.xml +++ b/org.fox.ttcomics/src/main/res/xml/preferences.xml @@ -1,66 +1,66 @@ -<?xml version="1.0" encoding="utf-8"?> -<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" > - - <PreferenceCategory android:title="@string/prefs_general" > - <Preference - android:key="comics_directory" - android:hint="@string/comics_directory_default" - android:summary="@string/prefs_comics_directory_summary" - android:title="@string/prefs_comics_directory" > - </Preference> - </PreferenceCategory> - <PreferenceCategory android:title="@string/prefs_sync" > - <CheckBoxPreference - android:defaultValue="false" - android:key="use_position_sync" - android:title="@string/prefs_use_position_sync" - android:summary="@string/prefs_use_position_sync_summary" - /> - - <Preference - android:dependency="use_position_sync" - android:key="clear_sync_data" - android:title="@string/prefs_clear_sync_data" - android:summary="@string/prefs_clear_sync_data_summary" > - </Preference> - - </PreferenceCategory> - - <PreferenceCategory android:title="@string/prefs_reading" android:key="prefs_reading"> - <CheckBoxPreference - android:defaultValue="false" - android:key="use_dark_theme" - android:title="@string/prefs_dark_theme" /> - - <!-- <CheckBoxPreference - android:defaultValue="false" - android:key="dim_status_bar" - android:title="@string/prefs_dim_status_bar" /> --> - - <CheckBoxPreference - android:defaultValue="false" - android:key="use_full_screen" - android:title="@string/prefs_use_full_screen" /> - - <CheckBoxPreference - android:defaultValue="false" - android:key="fit_to_width" - android:title="@string/prefs_fit_to_width" /> - - <CheckBoxPreference - android:defaultValue="false" - android:key="prevent_screen_sleep" - android:title="@string/prefs_prevent_screen_sleep" /> - - </PreferenceCategory> - - <Preference - android:key="version" - android:enabled="false" - android:title="@string/prefs_version_title" /> - - <Preference - android:key="build_timestamp" - android:enabled="false" - android:title="@string/prefs_build_timestamp_title" /> +<?xml version="1.0" encoding="utf-8"?>
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" >
+
+ <PreferenceCategory android:title="@string/prefs_general" >
+ <Preference
+ android:key="comics_directory"
+ android:hint="@string/comics_directory_default"
+ android:summary="@string/prefs_comics_directory_summary"
+ android:title="@string/prefs_comics_directory" >
+ </Preference>
+ </PreferenceCategory>
+ <PreferenceCategory android:title="@string/prefs_sync" >
+ <CheckBoxPreference
+ android:defaultValue="false"
+ android:key="use_position_sync"
+ android:title="@string/prefs_use_position_sync"
+ android:summary="@string/prefs_use_position_sync_summary"
+ />
+
+ <Preference
+ android:dependency="use_position_sync"
+ android:key="clear_sync_data"
+ android:title="@string/prefs_clear_sync_data"
+ android:summary="@string/prefs_clear_sync_data_summary" >
+ </Preference>
+
+ </PreferenceCategory>
+
+ <PreferenceCategory android:title="@string/prefs_reading" android:key="prefs_reading">
+ <CheckBoxPreference
+ android:defaultValue="false"
+ android:key="use_dark_theme"
+ android:title="@string/prefs_dark_theme" />
+
+ <!-- <CheckBoxPreference
+ android:defaultValue="false"
+ android:key="dim_status_bar"
+ android:title="@string/prefs_dim_status_bar" /> -->
+
+ <CheckBoxPreference
+ android:defaultValue="false"
+ android:key="use_full_screen"
+ android:title="@string/prefs_use_full_screen" />
+
+ <CheckBoxPreference
+ android:defaultValue="false"
+ android:key="fit_to_width"
+ android:title="@string/prefs_fit_to_width" />
+
+ <CheckBoxPreference
+ android:defaultValue="false"
+ android:key="prevent_screen_sleep"
+ android:title="@string/prefs_prevent_screen_sleep" />
+
+ </PreferenceCategory>
+
+ <Preference
+ android:key="version"
+ android:enabled="false"
+ android:title="@string/prefs_version_title" />
+
+ <Preference
+ android:key="build_timestamp"
+ android:enabled="false"
+ android:title="@string/prefs_build_timestamp_title" />
</PreferenceScreen>
\ No newline at end of file diff --git a/settings.gradle b/settings.gradle index d3db109..e0e41b0 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1 @@ -include ':app'
+include ':org.fox.ttcomics'
diff --git a/tt-comics.iml b/tt-comics.iml deleted file mode 100755 index 2a02201..0000000 --- a/tt-comics.iml +++ /dev/null @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" type="JAVA_MODULE" version="4"> - <component name="FacetManager"> - <facet type="java-gradle" name="Java-Gradle"> - <configuration> - <option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" /> - </configuration> - </facet> - </component> - <component name="NewModuleRootManager" inherit-compiler-output="false"> - <output url="file://$MODULE_DIR$/build/classes/main" /> - <output-test url="file://$MODULE_DIR$/build/classes/test" /> - <exclude-output /> - <content url="file://$MODULE_DIR$"> - <excludeFolder url="file://$MODULE_DIR$/.gradle" /> - </content> - <orderEntry type="inheritedJdk" /> - <orderEntry type="sourceFolder" forTests="false" /> - </component> -</module> - |