upd gradle & icon

16 files changed, 61 insertions, 29 deletions

diff --git a/org.fox.ttcomics/build.gradle b/org.fox.ttcomics/build.gradle
index 1964a81..c5ead0b 100755
--- a/org.fox.ttcomics/build.gradle
+++ b/org.fox.ttcomics/build.gradle
@@ -1,8 +1,8 @@
 apply plugin: 'com.android.application'

 

 android {

-    compileSdkVersion 27

-    buildToolsVersion "27.0.3"

+    compileSdkVersion 28

+    buildToolsVersion "28.0.3"

 

     defaultConfig {

         applicationId "org.fox.ttcomics2"

@@ -47,23 +47,23 @@ android {
 }

 

 dependencies {

-    compile 'com.android.support:support-v4:27.1.0'

-    compile 'com.android.support:appcompat-v7:27.1.0'

-    compile 'com.android.support:cardview-v7:27.1.0'

-    compile 'com.android.support:design:27.1.0'

-    compile 'com.shamanland:fab:0.0.8'

-    compile 'jp.co.recruit_mp:android-HeaderFooterGridView:0.2.4'

-    compile 'com.github.bumptech.glide:glide:3.8.0'

-    compile 'ch.acra:acra:4.9.1'

-    compile 'com.ToxicBakery.viewpager.transforms:view-pager-transforms:1.2.32@aar'

-    compile 'com.nhaarman.listviewanimations:lib-core:3.1.0@aar'

-    compile 'frankiesardo:icepick:3.2.0'

-    provided 'frankiesardo:icepick-processor:3.2.0'

-    compile 'com.github.livefront:bridge:v1.1.2'

+    implementation 'com.android.support:support-v4:27.1.0'

+    implementation 'com.android.support:appcompat-v7:27.1.0'

+    implementation 'com.android.support:cardview-v7:27.1.0'

+    implementation 'com.android.support:design:27.1.0'

+    implementation 'com.shamanland:fab:0.0.8'

+    implementation 'jp.co.recruit_mp:android-HeaderFooterGridView:0.2.4'

+    implementation 'com.github.bumptech.glide:glide:3.8.0'

+    implementation 'ch.acra:acra:4.9.1'

+    implementation 'com.ToxicBakery.viewpager.transforms:view-pager-transforms:1.2.32@aar'

+    implementation 'com.nhaarman.listviewanimations:lib-core:3.1.0@aar'

+    implementation 'frankiesardo:icepick:3.2.0'

+    compileOnly 'frankiesardo:icepick-processor:3.2.0'

+    implementation 'com.github.livefront:bridge:v1.1.2'

     annotationProcessor 'frankiesardo:icepick-processor:3.2.0'

-    compile 'com.google.android.gms:play-services-base:15.0.1'

-    compile 'com.google.android.gms:play-services-auth:15.0.1'

-    compile files('libs/nineoldandroids-2.4.0.jar')

-    compile 'com.gu:option:1.3'

-    compile 'net.rdrei.android.dirchooser:library:3.2@aar'

+    implementation 'com.google.android.gms:play-services-base:15.0.1'

+    implementation 'com.google.android.gms:play-services-auth:15.0.1'

+    implementation files('libs/nineoldandroids-2.4.0.jar')

+    implementation 'com.gu:option:1.3'

+    implementation 'net.rdrei.android.dirchooser:library:3.2@aar'

 }

diff --git a/org.fox.ttcomics/org.fox.ttcomics.iml b/org.fox.ttcomics/org.fox.ttcomics.iml
index cb4b500..05eed40 100755
--- a/org.fox.ttcomics/org.fox.ttcomics.iml
+++ b/org.fox.ttcomics/org.fox.ttcomics.iml
@@ -23,19 +23,19 @@
     </facet>
   </component>
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7">
-    <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
-    <output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
+    <output url="file://$MODULE_DIR$/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes" />
+    <output-test url="file://$MODULE_DIR$/build/intermediates/javac/debugUnitTest/compileDebugUnitTestJavaWithJavac/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/source/r/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/not_namespaced_r_class_sources/debug/processDebugResources/r" 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/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/source/r/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/not_namespaced_r_class_sources/debugAndroidTest/processDebugAndroidTestResources/r" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" 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/source/rs/androidTest/debug" isTestSource="true" generated="true" />
@@ -84,26 +84,52 @@
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
+      <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/assets" />
       <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/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/classes" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/compatible_screen_manifest" />
       <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_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/javaPrecompile" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javac" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
+      <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/manifests" />
+      <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/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/split-apk" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/split_list" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/splits-support" />
       <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" />
     </content>
-    <orderEntry type="jdk" jdkName="Android API 27 Platform" jdkType="Android SDK" />
+    <orderEntry type="jdk" jdkName="Android API 28 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="Gradle: com.android.support:transition-27.1.0" level="project" />
     <orderEntry type="library" name="Gradle: com.ToxicBakery.viewpager.transforms:view-pager-transforms-1.2.32" level="project" />
diff --git a/org.fox.ttcomics/src/main/AndroidManifest.xml b/org.fox.ttcomics/src/main/AndroidManifest.xml
index b10fe85..74e8cd3 100755
--- a/org.fox.ttcomics/src/main/AndroidManifest.xml
+++ b/org.fox.ttcomics/src/main/AndroidManifest.xml
@@ -1,7 +1,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"

+    xmlns:tools="http://schemas.android.com/tools"

     package="org.fox.ttcomics2"

-    android:versionCode="83"

-    android:versionName="1.41" >

+    android:versionCode="84"

+    android:versionName="1.42" >

 

     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />

     <uses-permission android:name="android.permission.INTERNET" />

@@ -9,12 +10,13 @@
     

     <application

 	    android:name=".Application"

-        android:icon="@drawable/ic_launcher"

+        android:icon="@mipmap/ic_launcher"

         android:label="@string/app_name"

         android:hardwareAccelerated="true"

         android:largeHeap="true"

         android:fullBackupOnly="true"

-        android:allowBackup="true">

+        android:allowBackup="true"

+        tools:ignore="GoogleAppIndexingWarning">

 

         <activity

             android:theme="@android:style/Theme.NoDisplay"

diff --git a/org.fox.ttcomics/src/main/ic_launcher-web.png b/org.fox.ttcomics/src/main/ic_launcher-web.png
new file mode 100644
index 0000000..3f9926d
--- /dev/null
+++ b/org.fox.ttcomics/src/main/ic_launcher-web.png
diff --git a/org.fox.ttcomics/src/main/res/mipmap-hdpi/ic_launcher.png b/org.fox.ttcomics/src/main/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 0000000..ab3ff48
--- /dev/null
+++ b/org.fox.ttcomics/src/main/res/mipmap-hdpi/ic_launcher.png
diff --git a/org.fox.ttcomics/src/main/res/mipmap-hdpi/ic_launcher_round.png b/org.fox.ttcomics/src/main/res/mipmap-hdpi/ic_launcher_round.png
new file mode 100644
index 0000000..2f9f7a0
--- /dev/null
+++ b/org.fox.ttcomics/src/main/res/mipmap-hdpi/ic_launcher_round.png
diff --git a/org.fox.ttcomics/src/main/res/mipmap-mdpi/ic_launcher.png b/org.fox.ttcomics/src/main/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 0000000..89dca8d
--- /dev/null
+++ b/org.fox.ttcomics/src/main/res/mipmap-mdpi/ic_launcher.png
diff --git a/org.fox.ttcomics/src/main/res/mipmap-mdpi/ic_launcher_round.png b/org.fox.ttcomics/src/main/res/mipmap-mdpi/ic_launcher_round.png
new file mode 100644
index 0000000..694b0fd
--- /dev/null
+++ b/org.fox.ttcomics/src/main/res/mipmap-mdpi/ic_launcher_round.png
diff --git a/org.fox.ttcomics/src/main/res/mipmap-xhdpi/ic_launcher.png b/org.fox.ttcomics/src/main/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 0000000..b48a14a
--- /dev/null
+++ b/org.fox.ttcomics/src/main/res/mipmap-xhdpi/ic_launcher.png
diff --git a/org.fox.ttcomics/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/org.fox.ttcomics/src/main/res/mipmap-xhdpi/ic_launcher_round.png
new file mode 100644
index 0000000..572844a
--- /dev/null
+++ b/org.fox.ttcomics/src/main/res/mipmap-xhdpi/ic_launcher_round.png
diff --git a/org.fox.ttcomics/src/main/res/mipmap-xxhdpi/ic_launcher.png b/org.fox.ttcomics/src/main/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 0000000..9528690
--- /dev/null
+++ b/org.fox.ttcomics/src/main/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/org.fox.ttcomics/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/org.fox.ttcomics/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
new file mode 100644
index 0000000..fce7ce1
--- /dev/null
+++ b/org.fox.ttcomics/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
diff --git a/org.fox.ttcomics/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/org.fox.ttcomics/src/main/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 0000000..a506989
--- /dev/null
+++ b/org.fox.ttcomics/src/main/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/org.fox.ttcomics/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/org.fox.ttcomics/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
new file mode 100644
index 0000000..4db1ad4
--- /dev/null
+++ b/org.fox.ttcomics/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
diff --git a/org.fox.ttcomics/src/main/res/values/ic_launcher_background.xml b/org.fox.ttcomics/src/main/res/values/ic_launcher_background.xml
new file mode 100644
index 0000000..c5d5899
--- /dev/null
+++ b/org.fox.ttcomics/src/main/res/values/ic_launcher_background.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="ic_launcher_background">#FFFFFF</color>
+</resources>
\ No newline at end of file
diff --git a/org.fox.ttcomics/src/main/web_hi_res_512.png b/org.fox.ttcomics/src/main/web_hi_res_512.png
new file mode 100644
index 0000000..66b6963
--- /dev/null
+++ b/org.fox.ttcomics/src/main/web_hi_res_512.png