From 146206aadb1efa8304adcf214242cbe3019c5ade Mon Sep 17 00:00:00 2001 From: kunfei Date: Fri, 20 Mar 2020 20:37:02 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 9 +++++---- app/src/main/assets/updateLog.md | 1 + app/src/main/res/layout/mo_dialog_markdown.xml | 2 -- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 98fe1909a5..e03369fca9 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,6 +1,6 @@ apply plugin: 'com.android.application' -apply plugin: 'kotlin-android-extensions' apply plugin: 'kotlin-android' +apply plugin: 'kotlin-android-extensions' apply plugin: 'org.greenrobot.greendao' apply plugin: 'io.fabric' apply plugin: "de.timfreiheit.resourceplaceholders" @@ -83,7 +83,7 @@ dependencies { implementation "org.jetbrains.anko:anko-sdk27-listeners:$anko_version" //fireBase - implementation 'com.google.firebase:firebase-core:17.2.2' + implementation 'com.google.firebase:firebase-core:17.2.3' implementation 'com.crashlytics.sdk.android:crashlytics:2.10.1' //androidX @@ -94,7 +94,7 @@ dependencies { implementation 'androidx.legacy:legacy-support-v4:1.0.0' //google - implementation 'com.google.android.material:material:1.2.0-alpha04' + implementation 'com.google.android.material:material:1.2.0-alpha05' implementation 'com.google.code.gson:gson:2.8.5' implementation 'com.google.android:flexbox:1.1.0' @@ -118,6 +118,7 @@ dependencies { implementation 'de.hdodenhof:circleimageview:3.0.0' //bind view + //noinspection AnnotationProcessorOnCompilePath implementation 'com.jakewharton:butterknife:10.1.0' annotationProcessor 'com.jakewharton:butterknife-compiler:10.1.0' @@ -126,7 +127,7 @@ dependencies { implementation 'org.nanohttpd:nanohttpd-websocket:2.3.1' //二维码 - implementation 'cn.bingoogolapple:bga-qrcode-zxing:1.3.6' + implementation 'cn.bingoogolapple:bga-qrcode-zxing:1.3.7' //颜色选择 implementation 'com.jaredrummler:colorpicker:1.1.0' diff --git a/app/src/main/assets/updateLog.md b/app/src/main/assets/updateLog.md index 1d26669319..8be888fd9e 100644 --- a/app/src/main/assets/updateLog.md +++ b/app/src/main/assets/updateLog.md @@ -5,6 +5,7 @@ **2020/03/20** * 自动备份文件和手动备份文件分开 +* 更新一些库文件 **2020/03/12** * 更新txt解析目录 by 52fisher diff --git a/app/src/main/res/layout/mo_dialog_markdown.xml b/app/src/main/res/layout/mo_dialog_markdown.xml index a8c5113fa5..0cd758c7a9 100644 --- a/app/src/main/res/layout/mo_dialog_markdown.xml +++ b/app/src/main/res/layout/mo_dialog_markdown.xml @@ -17,8 +17,6 @@ android:id="@+id/tv_markdown" android:layout_width="match_parent" android:layout_height="match_parent" - android:linksClickable="true" - android:autoLink="web" android:lineSpacingMultiplier="1.2" android:padding="10dp"/>