Compare commits

...

2 Commits

Author SHA1 Message Date
tom5079
608c6e6a1d App built 2020-09-26 21:01:36 +09:00
tom5079
bb2c91145f Dependency update 2020-09-26 20:58:46 +09:00
3 changed files with 38 additions and 38 deletions

View File

@@ -21,7 +21,7 @@ android {
minSdkVersion 16 minSdkVersion 16
targetSdkVersion 30 targetSdkVersion 30
versionCode 60 versionCode 60
versionName "5.1-hotfix2" versionName "5.1-hotfix3"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
vectorDrawables.useSupportLibrary = true vectorDrawables.useSupportLibrary = true
} }
@@ -60,58 +60,58 @@ android {
} }
dependencies { dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar']) implementation fileTree(dir: "libs", include: ["*.jar", "*.aar"])
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8" implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.9" implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.9"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.9" implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.9"
implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.0.0-RC2" implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.0.0-RC2"
implementation 'androidx.appcompat:appcompat:1.2.0' implementation "androidx.appcompat:appcompat:1.2.0"
implementation "androidx.activity:activity-ktx:1.2.0-alpha08" implementation "androidx.activity:activity-ktx:1.2.0-alpha08"
implementation 'androidx.fragment:fragment-ktx:1.3.0-alpha08' implementation "androidx.fragment:fragment-ktx:1.3.0-alpha08"
implementation 'androidx.preference:preference:1.1.1' implementation "androidx.preference:preference:1.1.1"
implementation 'androidx.constraintlayout:constraintlayout:2.0.1' implementation "androidx.constraintlayout:constraintlayout:2.0.1"
implementation 'androidx.gridlayout:gridlayout:1.0.0' implementation "androidx.gridlayout:gridlayout:1.0.0"
implementation "androidx.biometric:biometric:1.0.1" implementation "androidx.biometric:biometric:1.0.1"
implementation "com.daimajia.swipelayout:library:1.2.0@aar" implementation "com.daimajia.swipelayout:library:1.2.0@aar"
implementation 'com.google.android.material:material:1.3.0-alpha02' implementation "com.google.android.material:material:1.3.0-alpha02"
implementation 'com.google.firebase:firebase-core:17.5.0' implementation "com.google.firebase:firebase-core:17.5.0"
implementation 'com.google.firebase:firebase-analytics:17.5.0' implementation "com.google.firebase:firebase-analytics:17.5.0"
implementation 'com.google.firebase:firebase-crashlytics:17.2.1' implementation "com.google.firebase:firebase-crashlytics:17.2.1"
implementation 'com.google.firebase:firebase-perf:19.0.8' implementation "com.google.firebase:firebase-perf:19.0.8"
implementation 'com.google.android.gms:play-services-oss-licenses:17.0.0' implementation "com.google.android.gms:play-services-oss-licenses:17.0.0"
implementation 'com.google.android.gms:play-services-mlkit-face-detection:16.1.1' implementation "com.google.android.gms:play-services-mlkit-face-detection:16.1.1"
implementation 'com.github.clans:fab:1.6.4' implementation "com.github.clans:fab:1.6.4"
//implementation 'com.quiph.ui:recyclerviewfastscroller:0.2.1' //implementation "com.quiph.ui:recyclerviewfastscroller:0.2.1"
//noinspection GradleDependency //noinspection GradleDependency
implementation 'com.squareup.okhttp3:okhttp:3.12.12' implementation "com.squareup.okhttp3:okhttp:3.12.12"
implementation 'com.github.bumptech.glide:glide:4.11.0' implementation "com.github.bumptech.glide:glide:4.11.0"
implementation ("com.github.bumptech.glide:okhttp3-integration:4.11.0") { implementation ("com.github.bumptech.glide:okhttp3-integration:4.11.0") {
transitive = false transitive = false
} }
implementation ("com.github.bumptech.glide:recyclerview-integration:4.11.0") { implementation ("com.github.bumptech.glide:recyclerview-integration:4.11.0") {
transitive = false transitive = false
} }
implementation 'com.github.bumptech.glide:annotations:4.11.0' implementation "com.github.bumptech.glide:annotations:4.11.0"
annotationProcessor 'com.github.bumptech.glide:compiler:4.11.0' annotationProcessor "com.github.bumptech.glide:compiler:4.11.0"
kapt 'com.github.bumptech.glide:compiler:4.11.0' kapt "com.github.bumptech.glide:compiler:4.11.0"
implementation ("com.github.bumptech.glide:recyclerview-integration:4.11.0") { implementation ("com.github.bumptech.glide:recyclerview-integration:4.11.0") {
transitive = false transitive = false
} }
implementation 'com.tbuonomo.andrui:viewpagerdotsindicator:4.1.2' implementation "com.tbuonomo.andrui:viewpagerdotsindicator:4.1.2"
implementation 'com.gu:option:1.3' implementation "com.gu:option:1.3"
implementation 'net.rdrei.android.dirchooser:library:3.2@aar' implementation "net.rdrei.android.dirchooser:library:3.2@aar"
implementation 'com.github.chrisbanes:PhotoView:2.3.0' implementation "com.github.chrisbanes:PhotoView:2.3.0"
implementation 'com.andrognito.patternlockview:patternlockview:1.0.0' implementation "com.andrognito.patternlockview:patternlockview:1.0.0"
//implementation 'com.andrognito.pinlockview:pinlockview:2.1.0' //implementation "com.andrognito.pinlockview:pinlockview:2.1.0"
implementation "ru.noties.markwon:core:3.1.0" implementation "ru.noties.markwon:core:3.1.0"
implementation 'xyz.quaver:libpupil:1.7.1' implementation "xyz.quaver:libpupil:1.7.2"
implementation "xyz.quaver:documentfilex:0.2.15" implementation "xyz.quaver:documentfilex:0.2.15"
implementation "xyz.quaver:floatingsearchview:1.0.4" implementation "xyz.quaver:floatingsearchview:1.0.5"
testImplementation 'junit:junit:4.13' testImplementation "junit:junit:4.13"
androidTestImplementation 'androidx.test.ext:junit:1.1.2' androidTestImplementation "androidx.test.ext:junit:1.1.2"
androidTestImplementation 'androidx.test:rules:1.3.0' androidTestImplementation "androidx.test:rules:1.3.0"
androidTestImplementation 'androidx.test:runner:1.3.0' androidTestImplementation "androidx.test:runner:1.3.0"
androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0' androidTestImplementation "androidx.test.espresso:espresso-core:3.3.0"
} }
androidExtensions { androidExtensions {

View File

@@ -12,7 +12,7 @@
"filters": [], "filters": [],
"properties": [], "properties": [],
"versionCode": 60, "versionCode": 60,
"versionName": "5.1-hotfix2", "versionName": "5.1-hotfix3",
"enabled": true, "enabled": true,
"outputFile": "app-release.apk" "outputFile": "app-release.apk"
} }

View File

@@ -27,13 +27,11 @@ import android.content.Intent
import android.content.IntentFilter import android.content.IntentFilter
import android.net.Uri import android.net.Uri
import android.util.Base64 import android.util.Base64
import android.util.Log
import android.webkit.URLUtil import android.webkit.URLUtil
import androidx.appcompat.app.AlertDialog import androidx.appcompat.app.AlertDialog
import androidx.core.app.NotificationCompat import androidx.core.app.NotificationCompat
import androidx.core.app.NotificationManagerCompat import androidx.core.app.NotificationManagerCompat
import androidx.preference.PreferenceManager import androidx.preference.PreferenceManager
import com.google.firebase.crashlytics.FirebaseCrashlytics
import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.Job import kotlinx.coroutines.Job
@@ -52,7 +50,9 @@ import xyz.quaver.hitomi.getGalleryBlock
import xyz.quaver.hitomi.getReader import xyz.quaver.hitomi.getReader
import xyz.quaver.io.FileX import xyz.quaver.io.FileX
import xyz.quaver.io.util.getChild import xyz.quaver.io.util.getChild
import xyz.quaver.io.util.* import xyz.quaver.io.util.readText
import xyz.quaver.io.util.writeBytes
import xyz.quaver.io.util.writeText
import xyz.quaver.pupil.BuildConfig import xyz.quaver.pupil.BuildConfig
import xyz.quaver.pupil.R import xyz.quaver.pupil.R
import xyz.quaver.pupil.client import xyz.quaver.pupil.client