This commit is contained in:
aminecmi 2019-05-12 21:17:45 +02:00
parent dd7a2f476b
commit 6de54d63e6
4 changed files with 15 additions and 15 deletions

View File

@ -85,23 +85,23 @@ android {
dependencies { dependencies {
// Testing // Testing
androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0-beta02' androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0-beta01'
androidTestImplementation 'androidx.test:runner:1.1.0-beta02' androidTestImplementation 'androidx.test:runner:1.2.0-beta01'
// Espresso-contrib for DatePicker, RecyclerView, Drawer actions, Accessibility checks, CountingIdlingResource // Espresso-contrib for DatePicker, RecyclerView, Drawer actions, Accessibility checks, CountingIdlingResource
androidTestImplementation 'androidx.test.espresso:espresso-contrib:3.1.0-beta02' androidTestImplementation 'androidx.test.espresso:espresso-contrib:3.2.0-beta01'
// Espresso-intents for validation and stubbing of Intents // Espresso-intents for validation and stubbing of Intents
androidTestImplementation 'androidx.test.espresso:espresso-intents:3.1.0-beta02' androidTestImplementation 'androidx.test.espresso:espresso-intents:3.2.0-beta01'
implementation fileTree(include: ['*.jar'], dir: 'libs') implementation fileTree(include: ['*.jar'], dir: 'libs')
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
// Android Support // Android Support
implementation "androidx.appcompat:appcompat:$androidx_version" implementation "androidx.appcompat:appcompat:$androidx_version"
implementation "com.google.android.material:material:$android_version" implementation "com.google.android.material:material:1.1.0-alpha06"
implementation "androidx.recyclerview:recyclerview:$android_version" implementation "androidx.recyclerview:recyclerview:1.1.0-alpha05"
implementation "androidx.legacy:legacy-support-v4:$android_version" implementation "androidx.legacy:legacy-support-v4:$android_version"
implementation "androidx.vectordrawable:vectordrawable:$android_version" implementation "androidx.vectordrawable:vectordrawable:1.1.0-beta01"
implementation "androidx.browser:browser:$android_version" implementation "androidx.browser:browser:$android_version"
implementation "androidx.cardview:cardview:$android_version" implementation "androidx.cardview:cardview:$android_version"
implementation 'androidx.constraintlayout:constraintlayout:2.0.0-alpha4' implementation 'androidx.constraintlayout:constraintlayout:2.0.0-alpha5'
//multidex //multidex
implementation 'androidx.multidex:multidex:2.0.1' implementation 'androidx.multidex:multidex:2.0.1'
@ -127,7 +127,7 @@ dependencies {
implementation 'com.github.bumptech.glide:okhttp3-integration:4.1.1' implementation 'com.github.bumptech.glide:okhttp3-integration:4.1.1'
// Drawer // Drawer
implementation 'co.zsmb:materialdrawer-kt:2.0.1' implementation 'co.zsmb:materialdrawer-kt:2.0.2'
// Themes // Themes
implementation 'com.52inc:scoops:1.0.0' implementation 'com.52inc:scoops:1.0.0'

View File

@ -211,7 +211,7 @@ class ReaderActivity : AppCompatActivity() {
} }
} }
override fun onSaveInstanceState(oldInstanceState: Bundle?) { override fun onSaveInstanceState(oldInstanceState: Bundle) {
super.onSaveInstanceState(oldInstanceState) super.onSaveInstanceState(oldInstanceState)
oldInstanceState!!.clear() oldInstanceState!!.clear()
} }

View File

@ -5,14 +5,14 @@
<color name="colorAccent">#FFff5722</color> <color name="colorAccent">#FFff5722</color>
<color name="colorAccentDark">#FFbf360c</color> <color name="colorAccentDark">#FFbf360c</color>
<color name="pink">#FFe91e63</color> <color name="pink">#FFe91e63</color>
<color name="white">#FFFFFFFF</color> <color name="white">#FFFFFF</color>
<color name="black">#FF000000</color> <color name="black">#000000</color>
<color name="refresh_progress_1">@color/colorAccentDark</color> <color name="refresh_progress_1">@color/colorAccentDark</color>
<color name="refresh_progress_2">@color/colorAccent</color> <color name="refresh_progress_2">@color/colorAccent</color>
<color name="refresh_progress_3">@color/pink</color> <color name="refresh_progress_3">@color/pink</color>
<color name="background_grey">#FFe4e4e4</color> <color name="background_grey">#FFe4e4e4</color>
<color name="dark_webview">#FF303030</color> <color name="dark_webview">#303030</color>
<color name="dark_webview_text">#FFFFFF</color> <color name="dark_webview_text">#FFFFFF</color>
<color name="light_webview">#FAFAFA</color> <color name="light_webview">#FAFAFA</color>
<color name="light_webview_text">#212121</color> <color name="light_webview_text">#212121</color>

View File

@ -4,10 +4,10 @@ buildscript {
ext { ext {
kotlin_version = '1.3.31' kotlin_version = '1.3.31'
android_version = '1.0.0' android_version = '1.0.0'
androidx_version = '1.0.2' androidx_version = '1.1.0-alpha05'
lifecycle_version = '2.2.0-alpha01' lifecycle_version = '2.2.0-alpha01'
room_version = '2.1.0-beta01' room_version = '2.1.0-beta01'
work_version = "1.0.1-rc01" work_version = '1.0.1'
} }
repositories { repositories {
google() google()