diff options
26 files changed, 668 insertions, 661 deletions
diff --git a/.idea/.name b/.idea/.name index 0e0a20e..5eae97e 100644 --- a/.idea/.name +++ b/.idea/.name @@ -1 +1 @@ -Tiny-Comics-Reader
\ No newline at end of file +Pow! Comics Reader
\ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 48a7928..51e7748 100755 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -5,7 +5,7 @@ <GradleProjectSettings>
<option name="distributionType" value="LOCAL" />
<option name="externalProjectPath" value="$PROJECT_DIR$" />
- <option name="gradleHome" value="C:\Users\Andrew\AppData\Local\Android\android-studio1\gradle\gradle-2.2.1" />
+ <option name="gradleHome" value="C:\Users\fox\android-studio\gradle\gradle-2.2.1" />
<option name="modules">
<set>
<option value="$PROJECT_DIR$" />
diff --git a/.idea/modules.xml b/.idea/modules.xml index 93796ff..84a2cf4 100644..100755 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -2,8 +2,8 @@ <project version="4">
<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$/org.fox.ttcomics/org.fox.ttcomics.iml" filepath="$PROJECT_DIR$/org.fox.ttcomics/org.fox.ttcomics.iml" />
+ <module fileurl="file://$PROJECT_DIR$/tt-comics.iml" filepath="$PROJECT_DIR$/tt-comics.iml" />
</modules>
</component>
</project>
diff --git a/org.fox.ttcomics/build.gradle b/org.fox.ttcomics/build.gradle index efa0aa5..4cc9d02 100755 --- a/org.fox.ttcomics/build.gradle +++ b/org.fox.ttcomics/build.gradle @@ -29,4 +29,5 @@ dependencies { compile 'it.neokree:MaterialTabs:0.11'
compile files('libs/universal-image-loader-1.9.3.jar')
compile 'ch.acra:acra:4.5.0'
+ compile 'com.ToxicBakery.viewpager.transforms:view-pager-transforms:1.1.0@aar'
}
diff --git a/org.fox.ttcomics/org.fox.ttcomics.iml b/org.fox.ttcomics/org.fox.ttcomics.iml index 8d03d41..cd49182 100755 --- a/org.fox.ttcomics/org.fox.ttcomics.iml +++ b/org.fox.ttcomics/org.fox.ttcomics.iml @@ -1,96 +1,97 @@ -<?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>
-
+<?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="view-pager-transforms-1.1.0" 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/org.fox.ttcomics/src/main/AndroidManifest.xml b/org.fox.ttcomics/src/main/AndroidManifest.xml index 2af4fa6..a3fbf2d 100755 --- a/org.fox.ttcomics/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/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ComicPager.java b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ComicPager.java index 6ad4a5d..994b101 100644..100755 --- a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ComicPager.java +++ b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ComicPager.java @@ -14,6 +14,10 @@ import android.view.ViewGroup; import android.widget.SeekBar; import android.widget.TextView; +import com.ToxicBakery.viewpager.transforms.AccordionTransformer; +import com.ToxicBakery.viewpager.transforms.DepthPageTransformer; +import com.ToxicBakery.viewpager.transforms.StackTransformer; + import java.io.IOException; public class ComicPager extends Fragment { @@ -148,7 +152,8 @@ public class ComicPager extends Fragment { }); pager.setAdapter(m_adapter); - pager.setCurrentItem(position); + pager.setCurrentItem(position); + pager.setPageTransformer(true, new DepthPageTransformer()); m_activity.onComicSelected(m_fileName, position); diff --git a/org.fox.ttcomics/src/main/res/anim/appear.xml b/org.fox.ttcomics/src/main/res/anim/appear.xml index a60e055..9f44552 100644 --- a/org.fox.ttcomics/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/org.fox.ttcomics/src/main/res/layout-sw600dp/activity_main.xml b/org.fox.ttcomics/src/main/res/layout-sw600dp/activity_main.xml index 63a7abf..68170c5 100755 --- a/org.fox.ttcomics/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/org.fox.ttcomics/src/main/res/layout-sw600dp/activity_view_comic.xml b/org.fox.ttcomics/src/main/res/layout-sw600dp/activity_view_comic.xml index ba9bbd3..01f320b 100644 --- a/org.fox.ttcomics/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/org.fox.ttcomics/src/main/res/layout/activity_main.xml b/org.fox.ttcomics/src/main/res/layout/activity_main.xml index 0fdd5f0..0a6ecd0 100755 --- a/org.fox.ttcomics/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/org.fox.ttcomics/src/main/res/layout/activity_view_comic.xml b/org.fox.ttcomics/src/main/res/layout/activity_view_comic.xml index ea696a2..8016730 100644 --- a/org.fox.ttcomics/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/org.fox.ttcomics/src/main/res/layout/chooser_list.xml b/org.fox.ttcomics/src/main/res/layout/chooser_list.xml index f4b4a12..4200bc9 100644 --- a/org.fox.ttcomics/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/org.fox.ttcomics/src/main/res/layout/comics_grid_row.xml b/org.fox.ttcomics/src/main/res/layout/comics_grid_row.xml index 91d27cd..10f1ed4 100755 --- a/org.fox.ttcomics/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/org.fox.ttcomics/src/main/res/layout/dialog_location.xml b/org.fox.ttcomics/src/main/res/layout/dialog_location.xml index cabbf9a..4b946d3 100644 --- a/org.fox.ttcomics/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/org.fox.ttcomics/src/main/res/layout/fragment_comic.xml b/org.fox.ttcomics/src/main/res/layout/fragment_comic.xml index c9dbbfc..59103d4 100644 --- a/org.fox.ttcomics/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/org.fox.ttcomics/src/main/res/layout/fragment_comics_list.xml b/org.fox.ttcomics/src/main/res/layout/fragment_comics_list.xml index 7c7a8b5..5037747 100644 --- a/org.fox.ttcomics/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/org.fox.ttcomics/src/main/res/layout/fragment_comics_pager.xml b/org.fox.ttcomics/src/main/res/layout/fragment_comics_pager.xml index 3ac2f7b..fa5ebef 100755 --- a/org.fox.ttcomics/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/org.fox.ttcomics/src/main/res/layout/list_item.xml b/org.fox.ttcomics/src/main/res/layout/list_item.xml index 1fb2f8c..f0958d6 100644 --- a/org.fox.ttcomics/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/org.fox.ttcomics/src/main/res/values-large/dimens.xml b/org.fox.ttcomics/src/main/res/values-large/dimens.xml index 1ae597c..5c4a502 100644 --- a/org.fox.ttcomics/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/org.fox.ttcomics/src/main/res/values/attrs.xml b/org.fox.ttcomics/src/main/res/values/attrs.xml index 35c14ff..0d2c4cc 100644 --- a/org.fox.ttcomics/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/org.fox.ttcomics/src/main/res/values/dimens.xml b/org.fox.ttcomics/src/main/res/values/dimens.xml index 1dc0322..ec96646 100644 --- a/org.fox.ttcomics/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/org.fox.ttcomics/src/main/res/values/strings.xml b/org.fox.ttcomics/src/main/res/values/strings.xml index c626d44..baf00e5 100755 --- a/org.fox.ttcomics/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/org.fox.ttcomics/src/main/res/values/style.xml b/org.fox.ttcomics/src/main/res/values/style.xml index 92d0730..6852e4a 100755 --- a/org.fox.ttcomics/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/org.fox.ttcomics/src/main/res/xml/preferences.xml b/org.fox.ttcomics/src/main/res/xml/preferences.xml index 6f90c16..7ed6cb2 100644 --- a/org.fox.ttcomics/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/Tiny-Comics-Reader.iml b/tt-comics.iml index aae62e0..5550340 100755 --- a/Tiny-Comics-Reader.iml +++ b/tt-comics.iml @@ -1,21 +1,21 @@ -<?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="" external.system.module.version="unspecified" 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>
-
+<?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="" external.system.module.version="unspecified" 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> + |