Browse Source

update gradle

Andrew Dolgov 2 months ago
parent
commit
e1fee1f1de
48 changed files with 101 additions and 145 deletions
  1. 1 1
      build.gradle
  2. 0 0
      gradle.properties
  3. 2 2
      gradle/wrapper/gradle-wrapper.properties
  4. 0 0
      org.fox.ttcomics/build.gradle
  5. 71 115
      org.fox.ttcomics/org.fox.ttcomics.iml
  6. 0 0
      org.fox.ttcomics/src/main/AndroidManifest.xml
  7. 0 0
      org.fox.ttcomics/src/main/java/com/github/chrisbanes/photoview/CustomGestureDetector.java
  8. 0 0
      org.fox.ttcomics/src/main/java/com/github/chrisbanes/photoview/PhotoViewAttacher.java
  9. 0 0
      org.fox.ttcomics/src/main/java/org/fox/ttcomics2/Application.java
  10. 0 0
      org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ComicFragment.java
  11. 1 1
      org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ComicListFragment.java
  12. 0 0
      org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ComicPager.java
  13. 2 2
      org.fox.ttcomics/src/main/java/org/fox/ttcomics2/CommonActivity.java
  14. 1 1
      org.fox.ttcomics/src/main/java/org/fox/ttcomics2/DatabaseHelper.java
  15. 1 1
      org.fox.ttcomics/src/main/java/org/fox/ttcomics2/MainActivity.java
  16. 0 0
      org.fox.ttcomics/src/main/java/org/fox/ttcomics2/PreferencesActivity.java
  17. 0 0
      org.fox.ttcomics/src/main/java/org/fox/ttcomics2/PreferencesFragment.java
  18. 0 0
      org.fox.ttcomics/src/main/java/org/fox/ttcomics2/StateSavedFragment.java
  19. 0 0
      org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ViewComicActivity.java
  20. 0 0
      org.fox.ttcomics/src/main/java/org/fox/ttcomics2/archive/CbrComicArchive.java
  21. 0 0
      org.fox.ttcomics/src/main/java/org/fox/ttcomics2/archive/CbzComicArchive.java
  22. 0 0
      org.fox.ttcomics/src/main/java/org/fox/ttcomics2/junrar/Archive.java
  23. 0 0
      org.fox.ttcomics/src/main/java/org/fox/ttcomics2/junrar/Volume.java
  24. 0 0
      org.fox.ttcomics/src/main/java/org/fox/ttcomics2/junrar/impl/FileVolume.java
  25. 0 0
      org.fox.ttcomics/src/main/java/org/fox/ttcomics2/junrar/impl/FileVolumeManager.java
  26. 0 0
      org.fox.ttcomics/src/main/java/org/fox/ttcomics2/junrar/rarfile/FileHeader.java
  27. 0 0
      org.fox.ttcomics/src/main/java/org/fox/ttcomics2/junrar/unpack/ComprDataIO.java
  28. 0 0
      org.fox.ttcomics/src/main/java/org/fox/ttcomics2/junrar/unpack/Unpack.java
  29. 18 18
      org.fox.ttcomics/src/main/java/org/fox/ttcomics2/junrar/unpack/Unpack15.java
  30. 0 0
      org.fox.ttcomics/src/main/java/org/fox/ttcomics2/junrar/unpack/Unpack20.java
  31. 1 1
      org.fox.ttcomics/src/main/java/org/fox/ttcomics2/junrar/unpack/ppm/ModelPPM.java
  32. 0 0
      org.fox.ttcomics/src/main/java/org/fox/ttcomics2/junrar/unpack/ppm/RangeCoder.java
  33. 3 3
      org.fox.ttcomics/src/main/java/org/fox/ttcomics2/junrar/unpack/vm/RarVM.java
  34. 0 0
      org.fox.ttcomics/src/main/java/org/fox/ttcomics2/sync/SyncFolderService.java
  35. 0 0
      org.fox.ttcomics/src/main/java/org/fox/ttcomics2/utils/CacheCleanupService.java
  36. 0 0
      org.fox.ttcomics/src/main/res/layout/activity_main.xml
  37. 0 0
      org.fox.ttcomics/src/main/res/layout/comics_grid_row.xml
  38. 0 0
      org.fox.ttcomics/src/main/res/layout/fragment_comic.xml
  39. 0 0
      org.fox.ttcomics/src/main/res/layout/fragment_comics_grid.xml
  40. 0 0
      org.fox.ttcomics/src/main/res/layout/fragment_comics_pager.xml
  41. 0 0
      org.fox.ttcomics/src/main/res/layout/toolbar.xml
  42. 0 0
      org.fox.ttcomics/src/main/res/menu/activity_main.xml
  43. 0 0
      org.fox.ttcomics/src/main/res/values-v21/style.xml
  44. 0 0
      org.fox.ttcomics/src/main/res/values/strings.xml
  45. 0 0
      org.fox.ttcomics/src/main/res/values/style.xml
  46. 0 0
      org.fox.ttcomics/src/main/res/xml/fileprovider_paths.xml
  47. 0 0
      org.fox.ttcomics/src/main/res/xml/preferences.xml
  48. 0 0
      tt-comics.iml

+ 1 - 1
build.gradle

@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.0'
+        classpath 'com.android.tools.build:gradle:3.5.1'
     }
 }
 

+ 0 - 0
gradle.properties


+ 2 - 2
gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Sun Feb 24 09:48:27 MSK 2019
+#Wed Oct 30 13:07:16 MSK 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip

+ 0 - 0
org.fox.ttcomics/build.gradle


+ 71 - 115
org.fox.ttcomics/org.fox.ttcomics.iml

@@ -4,6 +4,8 @@
     <facet type="android-gradle" name="Android-Gradle">
       <configuration>
         <option name="GRADLE_PROJECT_PATH" value=":org.fox.ttcomics" />
+        <option name="LAST_SUCCESSFUL_SYNC_AGP_VERSION" value="3.5.1" />
+        <option name="LAST_KNOWN_AGP_VERSION" value="3.5.1" />
       </configuration>
     </facet>
     <facet type="android" name="Android">
@@ -17,29 +19,30 @@
         <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="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res;file://$MODULE_DIR$/build/generated/res/resValues/debug" />
+        <option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="" />
         <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
       </configuration>
     </facet>
   </component>
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7">
-    <output url="file://$MODULE_DIR$/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes" />
-    <output-test url="file://$MODULE_DIR$/build/intermediates/javac/debugUnitTest/compileDebugUnitTestJavaWithJavac/classes" />
+    <output url="file://$MODULE_DIR$/build/intermediates/javac/debug/classes" />
+    <output-test url="file://$MODULE_DIR$/build/intermediates/javac/debugUnitTest/classes" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debug/compileDebugAidl/out" 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/renderscript_source_output_dir/debug/compileDebugRenderscript/out" 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/resValues/debug" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debugAndroidTest/out" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debugAndroidTest/compileDebugAndroidTestAidl/out" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debugAndroidTest/compileDebugAndroidTestRenderscript/out" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/test/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debugUnitTest/out" isTestSource="true" generated="true" />
       <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" />
@@ -47,13 +50,6 @@
       <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/assets" type="java-test-resource" />
@@ -61,6 +57,13 @@
       <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
       <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" />
@@ -82,120 +85,73 @@
       <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
-      <excludeFolder url="file://$MODULE_DIR$/build/generated/not_namespaced_r_class_sources" />
-      <excludeFolder url="file://$MODULE_DIR$/build/generated/source/r" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotation_processor_list" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/apk_list" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/build-info" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundle_manifest" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-libraries" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-manifest" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/checkDebugClasspath" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/checkReleaseClasspath" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/check_manifest_result" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/compatible_screen_manifest" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/external_libs_dex" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-classes" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-runtime-classes" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-verifier" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-apk" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant_app_manifest" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant_run_app_info_output_file" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant_run_main_apk_resources" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant_run_merged_manifests" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant_run_split_apk_resources" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javac" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint_jar" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifest-checker" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_assets" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_manifests" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/metadata_feature_manifest" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/prebuild" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/processed_res" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/resources" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shader_assets" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/signing_config" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/split-apk" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/split_list" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
-      <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
+      <excludeFolder url="file://$MODULE_DIR$/build" />
     </content>
     <orderEntry type="jdk" jdkName="Android API 28 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Gradle: stencil:stencil:[email protected]" level="project" />
-    <orderEntry type="library" name="Gradle: org.clojure:data.priority-map:[email protected]" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.android.material:material:[email protected]" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.drawerlayout:drawerlayout:[email protected]" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.documentfile:documentfile:[email protected]" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.localbroadcastmanager:localbroadcastmanager:[email protected]" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.cardview:cardview:[email protected]" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.recyclerview:recyclerview:[email protected]" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-runtime:[email protected]" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-livedata-core:[email protected]" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-base:[email protected]" level="project" />
-    <orderEntry type="library" name="Gradle: net.rdrei.android.dirchooser:library:[email protected]" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.cursoradapter:cursoradapter:[email protected]" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.customview:customview:[email protected]" level="project" />
     <orderEntry type="library" name="Gradle: __local_aars__:C.\Users\fox\Projects\tt-comics\org.fox.ttcomics\libs\nineoldandroids-2.4.0.jar:[email protected]" level="project" />
-    <orderEntry type="library" name="Gradle: com.ToxicBakery.viewpager.transforms:view-pager-transforms:[email protected]" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.asynclayoutinflater:asynclayoutinflater:[email protected]" level="project" />
+    <orderEntry type="library" name="Gradle: frankiesardo:icepick-processor:[email protected]" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.collection:collection:[email protected]" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-common:[email protected]" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.arch.core:core-common:[email protected]" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.annotation:annotation:[email protected]" level="project" />
+    <orderEntry type="library" name="Gradle: com.github.bumptech.glide:glide:[email protected]" level="project" />
+    <orderEntry type="library" name="Gradle: frankiesardo:icepick:[email protected]" level="project" />
     <orderEntry type="library" name="Gradle: com.gu:option:[email protected]" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.vectordrawable:vectordrawable:[email protected]" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.interpolator:interpolator:[email protected]" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.fragment:fragment:[email protected]" level="project" />
+    <orderEntry type="library" name="Gradle: stencil:stencil:[email protected]" level="project" />
+    <orderEntry type="library" name="Gradle: scout:scout:[email protected]" level="project" />
     <orderEntry type="library" name="Gradle: quoin:quoin:[email protected]" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.slidingpanelayout:slidingpanelayout:[email protected]" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.media:media:[email protected]" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-basement:[email protected]" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-auth-api-phone:[email protected]" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.coordinatorlayout:coordinatorlayout:[email protected]" level="project" />
-    <orderEntry type="library" name="Gradle: jp.co.recruit_mp:android-HeaderFooterGridView:[email protected]" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-auth:[email protected]" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.legacy:legacy-support-v4:[email protected]" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.arch.core:core-runtime:[email protected]" level="project" />
+    <orderEntry type="library" name="Gradle: slingshot:slingshot:[email protected]" level="project" />
+    <orderEntry type="library" name="Gradle: org.clojure:core.cache:[email protected]" level="project" />
+    <orderEntry type="library" name="Gradle: org.clojure:data.priority-map:[email protected]" level="project" />
     <orderEntry type="library" name="Gradle: org.clojure:clojure:[email protected]" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.swiperefreshlayout:swiperefreshlayout:[email protected]" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.guava:guava:[email protected]" level="project" />
     <orderEntry type="library" name="Gradle: com.google.auto.service:auto-service:[email protected]" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.auto:auto-common:[email protected]" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.guava:guava:[email protected]" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-auth:[email protected]" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-auth-api-phone:[email protected]" level="project" />
     <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-auth-base:[email protected]" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.viewpager:viewpager:[email protected]" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.legacy:legacy-support-core-ui:[email protected]" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-base:[email protected]" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-tasks:[email protected]" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-basement:[email protected]" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.legacy:legacy-support-v4:[email protected]" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.android.material:material:[email protected]" level="project" />
+    <orderEntry type="library" name="Gradle: com.github.livefront:bridge:[email protected]" level="project" />
     <orderEntry type="library" name="Gradle: com.github.joielechong:zip4jandroid:[email protected]" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.loader:loader:[email protected]" level="project" />
-    <orderEntry type="library" name="Gradle: frankiesardo:icepick:[email protected]" level="project" />
     <orderEntry type="library" name="Gradle: androidx.appcompat:appcompat:[email protected]" level="project" />
-    <orderEntry type="library" name="Gradle: scout:scout:[email protected]" level="project" />
-    <orderEntry type="library" name="Gradle: com.github.livefront:bridge:[email protected]" level="project" />
-    <orderEntry type="library" name="Gradle: com.github.bumptech.glide:glide:[email protected]" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-livedata:[email protected]" level="project" />
-    <orderEntry type="library" name="Gradle: frankiesardo:icepick-processor:[email protected]" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.auto:auto-common:[email protected]" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.media:media:[email protected]" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.fragment:fragment:[email protected]" level="project" />
     <orderEntry type="library" name="Gradle: androidx.vectordrawable:vectordrawable-animated:[email protected]" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-common:[email protected]" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.recyclerview:recyclerview:[email protected]" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.legacy:legacy-support-core-ui:[email protected]" level="project" />
     <orderEntry type="library" name="Gradle: androidx.legacy:legacy-support-core-utils:[email protected]" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.print:print:[email protected]" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.vectordrawable:vectordrawable:[email protected]" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.transition:transition:[email protected]" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.loader:loader:[email protected]" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.viewpager:viewpager:[email protected]" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.coordinatorlayout:coordinatorlayout:[email protected]" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.drawerlayout:drawerlayout:[email protected]" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.slidingpanelayout:slidingpanelayout:[email protected]" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.customview:customview:[email protected]" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.swiperefreshlayout:swiperefreshlayout:[email protected]" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.asynclayoutinflater:asynclayoutinflater:[email protected]" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.core:core:[email protected]" level="project" />
     <orderEntry type="library" name="Gradle: androidx.versionedparcelable:versionedparcelable:[email protected]" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.cursoradapter:cursoradapter:[email protected]" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.cardview:cardview:[email protected]" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.documentfile:documentfile:[email protected]" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.localbroadcastmanager:localbroadcastmanager:[email protected]" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.print:print:[email protected]" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.interpolator:interpolator:[email protected]" level="project" />
     <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-viewmodel:[email protected]" level="project" />
-    <orderEntry type="library" name="Gradle: org.clojure:core.cache:[email protected]" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.arch.core:core-common:[email protected]" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-runtime:[email protected]" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-livedata:[email protected]" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-livedata-core:[email protected]" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.arch.core:core-runtime:[email protected]" level="project" />
     <orderEntry type="library" name="Gradle: com.shamanland:fab:[email protected]" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.transition:transition:[email protected]" level="project" />
-    <orderEntry type="library" name="Gradle: slingshot:slingshot:[email protected]" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.annotation:annotation:[email protected]" level="project" />
+    <orderEntry type="library" name="Gradle: jp.co.recruit_mp:android-HeaderFooterGridView:[email protected]" level="project" />
+    <orderEntry type="library" name="Gradle: com.ToxicBakery.viewpager.transforms:view-pager-transforms:[email protected]" level="project" />
     <orderEntry type="library" name="Gradle: com.nhaarman.listviewanimations:lib-core:[email protected]" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.core:core:[email protected]" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.collection:collection:[email protected]" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-tasks:[email protected]" level="project" />
+    <orderEntry type="library" name="Gradle: net.rdrei.android.dirchooser:library:[email protected]" level="project" />
   </component>
 </module>

+ 0 - 0
org.fox.ttcomics/src/main/AndroidManifest.xml


+ 0 - 0
org.fox.ttcomics/src/main/java/com/github/chrisbanes/photoview/CustomGestureDetector.java


+ 0 - 0
org.fox.ttcomics/src/main/java/com/github/chrisbanes/photoview/PhotoViewAttacher.java


+ 0 - 0
org.fox.ttcomics/src/main/java/org/fox/ttcomics2/Application.java


+ 0 - 0
org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ComicFragment.java


+ 1 - 1
org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ComicListFragment.java

@@ -328,7 +328,7 @@ public class ComicListFragment extends StateSavedFragment implements OnItemClick
 
 	private Cursor createCursor() {
 		String selection;
-		String selectionArgs[];
+        String[] selectionArgs;
 
 		switch (m_mode) {
 		case MODE_READ:

+ 0 - 0
org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ComicPager.java


+ 2 - 2
org.fox.ttcomics/src/main/java/org/fox/ttcomics2/CommonActivity.java

@@ -134,7 +134,7 @@ public class CommonActivity extends AppCompatActivity {
 		try {
 			MessageDigest digest = java.security.MessageDigest.getInstance("MD5");
 	        digest.update(s.getBytes());
-	        byte messageDigest[] = digest.digest();
+            byte[] messageDigest = digest.digest();
 	        
 	        StringBuffer hexString = new StringBuffer();
 	        for (int i=0; i<messageDigest.length; i++)
@@ -154,7 +154,7 @@ public class CommonActivity extends AppCompatActivity {
 			try {
 				MessageDigest digest = java.security.MessageDigest.getInstance("SHA1");
 		        digest.update(s.getBytes());
-		        byte messageDigest[] = digest.digest();
+                byte[] messageDigest = digest.digest();
 		        
 		        StringBuffer hexString = new StringBuffer();
 		        for (int i=0; i<messageDigest.length; i++)

+ 1 - 1
org.fox.ttcomics/src/main/java/org/fox/ttcomics2/DatabaseHelper.java

@@ -302,7 +302,7 @@ public class DatabaseHelper extends SQLiteOpenHelper {
 					int fileIndex = 0;
 
 					if (dir.isDirectory()) {
-						File archives[] = dir.listFiles();
+                        File[] archives = dir.listFiles();
 
 						java.util.Arrays.sort(archives);
 

+ 1 - 1
org.fox.ttcomics/src/main/java/org/fox/ttcomics2/MainActivity.java

@@ -174,7 +174,7 @@ public class MainActivity extends CommonActivity implements SharedPreferences.On
 
 	@Override
 	public void onRequestPermissionsResult(int requestCode,
-										   String permissions[], int[] grantResults) {
+                                           String[] permissions, int[] grantResults) {
 
 		super.onRequestPermissionsResult(requestCode, permissions, grantResults);
 

+ 0 - 0
org.fox.ttcomics/src/main/java/org/fox/ttcomics2/PreferencesActivity.java


+ 0 - 0
org.fox.ttcomics/src/main/java/org/fox/ttcomics2/PreferencesFragment.java


+ 0 - 0
org.fox.ttcomics/src/main/java/org/fox/ttcomics2/StateSavedFragment.java


+ 0 - 0
org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ViewComicActivity.java


+ 0 - 0
org.fox.ttcomics/src/main/java/org/fox/ttcomics2/archive/CbrComicArchive.java


+ 0 - 0
org.fox.ttcomics/src/main/java/org/fox/ttcomics2/archive/CbzComicArchive.java


+ 0 - 0
org.fox.ttcomics/src/main/java/org/fox/ttcomics2/junrar/Archive.java


+ 0 - 0
org.fox.ttcomics/src/main/java/org/fox/ttcomics2/junrar/Volume.java


+ 0 - 0
org.fox.ttcomics/src/main/java/org/fox/ttcomics2/junrar/impl/FileVolume.java


+ 0 - 0
org.fox.ttcomics/src/main/java/org/fox/ttcomics2/junrar/impl/FileVolumeManager.java


+ 0 - 0
org.fox.ttcomics/src/main/java/org/fox/ttcomics2/junrar/rarfile/FileHeader.java


+ 0 - 0
org.fox.ttcomics/src/main/java/org/fox/ttcomics2/junrar/unpack/ComprDataIO.java


+ 0 - 0
org.fox.ttcomics/src/main/java/org/fox/ttcomics2/junrar/unpack/Unpack.java


+ 18 - 18
org.fox.ttcomics/src/main/java/org/fox/ttcomics2/junrar/unpack/Unpack15.java

@@ -34,35 +34,35 @@ public abstract class Unpack15 extends BitInput {
     private static final int STARTHF2 = 5;
     private static final int STARTHF3 = 6;
     private static final int STARTHF4 = 8;
-    static int ShortLen1[] = {1, 3, 4, 4, 5, 6, 7, 8, 8, 4, 4, 5, 6, 6, 4, 0};
-    static int ShortXor1[] = {0, 0xa0, 0xd0, 0xe0, 0xf0, 0xf8, 0xfc, 0xfe,
+    static int[] ShortLen1 = {1, 3, 4, 4, 5, 6, 7, 8, 8, 4, 4, 5, 6, 6, 4, 0};
+    static int[] ShortXor1 = {0, 0xa0, 0xd0, 0xe0, 0xf0, 0xf8, 0xfc, 0xfe,
             0xff, 0xc0, 0x80, 0x90, 0x98, 0x9c, 0xb0};
-    static int ShortLen2[] = {2, 3, 3, 3, 4, 4, 5, 6, 6, 4, 4, 5, 6, 6, 4, 0};
-    static int ShortXor2[] = {0, 0x40, 0x60, 0xa0, 0xd0, 0xe0, 0xf0, 0xf8,
+    static int[] ShortLen2 = {2, 3, 3, 3, 4, 4, 5, 6, 6, 4, 4, 5, 6, 6, 4, 0};
+    static int[] ShortXor2 = {0, 0x40, 0x60, 0xa0, 0xd0, 0xe0, 0xf0, 0xf8,
             0xfc, 0xc0, 0x80, 0x90, 0x98, 0x9c, 0xb0};
-    private static int DecL1[] = {0x8000, 0xa000, 0xc000, 0xd000, 0xe000,
+    private static int[] DecL1 = {0x8000, 0xa000, 0xc000, 0xd000, 0xe000,
             0xea00, 0xee00, 0xf000, 0xf200, 0xf200, 0xffff};
-    private static int PosL1[] = {0, 0, 0, 2, 3, 5, 7, 11, 16, 20, 24, 32, 32};
-    private static int DecL2[] = {0xa000, 0xc000, 0xd000, 0xe000, 0xea00,
+    private static int[] PosL1 = {0, 0, 0, 2, 3, 5, 7, 11, 16, 20, 24, 32, 32};
+    private static int[] DecL2 = {0xa000, 0xc000, 0xd000, 0xe000, 0xea00,
             0xee00, 0xf000, 0xf200, 0xf240, 0xffff};
-    private static int PosL2[] = {0, 0, 0, 0, 5, 7, 9, 13, 18, 22, 26, 34, 36};
-    private static int DecHf0[] = {0x8000, 0xc000, 0xe000, 0xf200, 0xf200,
+    private static int[] PosL2 = {0, 0, 0, 0, 5, 7, 9, 13, 18, 22, 26, 34, 36};
+    private static int[] DecHf0 = {0x8000, 0xc000, 0xe000, 0xf200, 0xf200,
             0xf200, 0xf200, 0xf200, 0xffff};
-    private static int PosHf0[] = {0, 0, 0, 0, 0, 8, 16, 24, 33, 33, 33, 33,
+    private static int[] PosHf0 = {0, 0, 0, 0, 0, 8, 16, 24, 33, 33, 33, 33,
             33};
-    private static int DecHf1[] = {0x2000, 0xc000, 0xe000, 0xf000, 0xf200,
+    private static int[] DecHf1 = {0x2000, 0xc000, 0xe000, 0xf000, 0xf200,
             0xf200, 0xf7e0, 0xffff};
-    private static int PosHf1[] = {0, 0, 0, 0, 0, 0, 4, 44, 60, 76, 80, 80,
+    private static int[] PosHf1 = {0, 0, 0, 0, 0, 0, 4, 44, 60, 76, 80, 80,
             127};
-    private static int DecHf2[] = {0x1000, 0x2400, 0x8000, 0xc000, 0xfa00,
+    private static int[] DecHf2 = {0x1000, 0x2400, 0x8000, 0xc000, 0xfa00,
             0xffff, 0xffff, 0xffff};
-    private static int PosHf2[] = {0, 0, 0, 0, 0, 0, 2, 7, 53, 117, 233, 0, 0};
-    private static int DecHf3[] = {0x800, 0x2400, 0xee00, 0xfe80, 0xffff,
+    private static int[] PosHf2 = {0, 0, 0, 0, 0, 0, 2, 7, 53, 117, 233, 0, 0};
+    private static int[] DecHf3 = {0x800, 0x2400, 0xee00, 0xfe80, 0xffff,
             0xffff, 0xffff};
-    private static int PosHf3[] = {0, 0, 0, 0, 0, 0, 0, 2, 16, 218, 251, 0, 0};
-    private static int DecHf4[] = {0xff00, 0xffff, 0xffff, 0xffff, 0xffff,
+    private static int[] PosHf3 = {0, 0, 0, 0, 0, 0, 0, 2, 16, 218, 251, 0, 0};
+    private static int[] DecHf4 = {0xff00, 0xffff, 0xffff, 0xffff, 0xffff,
             0xffff};
-    private static int PosHf4[] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 0, 0, 0};
+    private static int[] PosHf4 = {0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 0, 0, 0};
     protected int readBorder;
     protected boolean suspended;
     protected boolean unpAllBuf;

+ 0 - 0
org.fox.ttcomics/src/main/java/org/fox/ttcomics2/junrar/unpack/Unpack20.java


+ 1 - 1
org.fox.ttcomics/src/main/java/org/fox/ttcomics2/junrar/unpack/ppm/ModelPPM.java

@@ -38,7 +38,7 @@ public class ModelPPM {
     public static final int BIN_SCALE = 1 << TOT_BITS;
 
     public static final int MAX_FREQ = 124;
-    private static int InitBinEsc[] = {0x3CDD, 0x1F3F, 0x59BF, 0x48F3,
+    private static int[] InitBinEsc = {0x3CDD, 0x1F3F, 0x59BF, 0x48F3,
             0x64A1, 0x5ABC, 0x6632, 0x6051};
     // Temp fields
     private final State tempState1 = new State(null);

+ 0 - 0
org.fox.ttcomics/src/main/java/org/fox/ttcomics2/junrar/unpack/ppm/RangeCoder.java


+ 3 - 3
org.fox.ttcomics/src/main/java/org/fox/ttcomics2/junrar/unpack/vm/RarVM.java

@@ -888,7 +888,7 @@ public class RarVM extends BitInput {
     }
 
     private VMStandardFilters IsStandardFilter(byte[] code, int codeSize) {
-        VMStandardFilterSignature stdList[] = {
+        VMStandardFilterSignature[] stdList = {
                 new VMStandardFilterSignature(53, 0xad576887, VMStandardFilters.VMSF_E8),
                 new VMStandardFilterSignature(57, 0x3cd7e57e, VMStandardFilters.VMSF_E8E9),
                 new VMStandardFilterSignature(120, 0x3769893f, VMStandardFilters.VMSF_ITANIUM),
@@ -959,7 +959,7 @@ public class RarVM extends BitInput {
                     break;
                 }
                 int curPos = 0;
-                final byte Masks[] = {4, 4, 6, 6, 0, 0, 7, 7, 4, 4, 0, 0, 4, 4, 0, 0};
+                final byte[] Masks = {4, 4, 6, 6, 0, 0, 7, 7, 4, 4, 0, 0, 4, 4, 0, 0};
                 fileOffset >>>= 4;
 
                 while (curPos < dataSize - 21) {
@@ -1065,7 +1065,7 @@ public class RarVM extends BitInput {
                 for (int curChannel = 0; curChannel < channels; curChannel++) {
                     long prevByte = 0;
                     long prevDelta = 0;
-                    long Dif[] = new long[7];
+                    long[] Dif = new long[7];
                     int D1 = 0, D2 = 0, D3;
                     int K1 = 0, K2 = 0, K3 = 0;
 

+ 0 - 0
org.fox.ttcomics/src/main/java/org/fox/ttcomics2/sync/SyncFolderService.java


+ 0 - 0
org.fox.ttcomics/src/main/java/org/fox/ttcomics2/utils/CacheCleanupService.java


+ 0 - 0
org.fox.ttcomics/src/main/res/layout/activity_main.xml


+ 0 - 0
org.fox.ttcomics/src/main/res/layout/comics_grid_row.xml


+ 0 - 0
org.fox.ttcomics/src/main/res/layout/fragment_comic.xml


+ 0 - 0
org.fox.ttcomics/src/main/res/layout/fragment_comics_grid.xml


+ 0 - 0
org.fox.ttcomics/src/main/res/layout/fragment_comics_pager.xml


+ 0 - 0
org.fox.ttcomics/src/main/res/layout/toolbar.xml


+ 0 - 0
org.fox.ttcomics/src/main/res/menu/activity_main.xml


+ 0 - 0
org.fox.ttcomics/src/main/res/values-v21/style.xml


+ 0 - 0
org.fox.ttcomics/src/main/res/values/strings.xml


+ 0 - 0
org.fox.ttcomics/src/main/res/values/style.xml


+ 0 - 0
org.fox.ttcomics/src/main/res/xml/fileprovider_paths.xml


+ 0 - 0
org.fox.ttcomics/src/main/res/xml/preferences.xml


+ 0 - 0
tt-comics.iml