external/tachiyomi
1
0
Fork 0
mirror of https://github.com/tachiyomiorg/tachiyomi.git synced 2024-11-10 12:37:47 +01:00
Code Issues Projects Releases Packages Wiki Activity

Bump dependencies. Fix crash in reader

Browse source
This commit is contained in:
len 2016-03-17 21:02:40 +01:00
parent de53681d2b
commit 396a79899e
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/build.gradle
View file

@ -101,9 +101,9 @@ apt {
dependencies { dependencies {
final SUPPORT_LIBRARY_VERSION = '23.2.1' final SUPPORT_LIBRARY_VERSION = '23.2.1'
final DAGGER_VERSION = '2.0.2' final DAGGER_VERSION = '2.1'
final OKHTTP_VERSION = '3.2.0' final OKHTTP_VERSION = '3.2.0'
final RETROFIT_VERSION = '2.0.0-beta4' final RETROFIT_VERSION = '2.0.0'
final STORIO_VERSION = '1.8.0' final STORIO_VERSION = '1.8.0'
final ICEPICK_VERSION = '3.2.0' final ICEPICK_VERSION = '3.2.0'
final MOCKITO_VERSION = '1.10.19' final MOCKITO_VERSION = '1.10.19'
@ -123,7 +123,7 @@ dependencies {
compile "com.squareup.okhttp3:okhttp:$OKHTTP_VERSION" compile "com.squareup.okhttp3:okhttp:$OKHTTP_VERSION"
compile "com.squareup.okhttp3:okhttp-urlconnection:$OKHTTP_VERSION" compile "com.squareup.okhttp3:okhttp-urlconnection:$OKHTTP_VERSION"
compile 'com.squareup.okio:okio:1.6.0' compile 'com.squareup.okio:okio:1.6.0'
compile 'com.google.code.gson:gson:2.6.1' compile 'com.google.code.gson:gson:2.6.2'
compile 'com.jakewharton:disklrucache:2.0.2' compile 'com.jakewharton:disklrucache:2.0.2'
compile 'org.jsoup:jsoup:1.8.3' compile 'org.jsoup:jsoup:1.8.3'
compile 'io.reactivex:rxandroid:1.1.0' compile 'io.reactivex:rxandroid:1.1.0'
@ -138,7 +138,7 @@ dependencies {
compile 'com.github.bumptech.glide:glide:3.7.0' compile 'com.github.bumptech.glide:glide:3.7.0'
compile 'com.jakewharton:butterknife:7.0.1' compile 'com.jakewharton:butterknife:7.0.1'
compile 'com.jakewharton.timber:timber:4.1.1' compile 'com.jakewharton.timber:timber:4.1.1'
compile 'ch.acra:acra:4.8.2' compile 'ch.acra:acra:4.8.3'
compile "frankiesardo:icepick:$ICEPICK_VERSION" compile "frankiesardo:icepick:$ICEPICK_VERSION"
provided "frankiesardo:icepick-processor:$ICEPICK_VERSION" provided "frankiesardo:icepick-processor:$ICEPICK_VERSION"
compile 'com.github.dmytrodanylyk.android-process-button:library:1.0.4' compile 'com.github.dmytrodanylyk.android-process-button:library:1.0.4'
@ -154,7 +154,7 @@ dependencies {
apt "com.pushtorefresh.storio:sqlite-annotations-processor:$STORIO_VERSION" apt "com.pushtorefresh.storio:sqlite-annotations-processor:$STORIO_VERSION"
provided 'org.glassfish:javax.annotation:10.0-b28' provided 'org.glassfish:javax.annotation:10.0-b28'
compile('com.github.afollestad.material-dialogs:core:0.8.5.6@aar') { compile('com.github.afollestad.material-dialogs:core:0.8.5.7@aar') {
transitive = true transitive = true
} }
@ -172,7 +172,7 @@ dependencies {
} }
buildscript { buildscript {
ext.kotlin_version = '1.0.0' ext.kotlin_version = '1.0.1'
repositories { repositories {
mavenCentral() mavenCentral()
} }

4
app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerReaderFragment.kt
View file

@ -74,12 +74,12 @@ class PagerReaderFragment : BaseFragment() {
/** /**
* Text color for black theme. * Text color for black theme.
*/ */
private val whiteColor = ContextCompat.getColor(context, R.color.textColorSecondaryDark) private val whiteColor by lazy { ContextCompat.getColor(context, R.color.textColorSecondaryDark) }
/** /**
* Text color for white theme. * Text color for white theme.
*/ */
private val blackColor = ContextCompat.getColor(context, R.color.textColorSecondaryLight) private val blackColor by lazy { ContextCompat.getColor(context, R.color.textColorSecondaryLight) }
override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedState: Bundle?): View? { override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedState: Bundle?): View? {
return inflater.inflate(R.layout.item_pager_reader, container, false) return inflater.inflate(R.layout.item_pager_reader, container, false)