From 8655f1108a3b120e91d7ad8e5b9e7b7dfb7cac33 Mon Sep 17 00:00:00 2001 From: pppscn <35696959@qq.com> Date: Sun, 7 Aug 2022 09:46:44 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E7=BA=A7=EF=BC=9Agradle=E4=BE=9D?= =?UTF-8?q?=E8=B5=96=E5=BA=93=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 4 ++-- .../sms/forwarder/database/viewmodel/BaseViewModelFactory.kt | 2 +- app/src/main/res/layout/fragment_server.xml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 28855386..74322aef 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -184,8 +184,8 @@ dependencies { androidTestImplementation deps.espresso.core implementation 'androidx.core:core-ktx:1.8.0' - implementation "androidx.activity:activity-ktx:1.4.0" - implementation "androidx.fragment:fragment-ktx:1.4.1" + implementation "androidx.activity:activity-ktx:1.5.1" + implementation "androidx.fragment:fragment-ktx:1.5.1" implementation "androidx.cardview:cardview:1.0.0" implementation 'androidx.appcompat:appcompat:1.4.2' implementation 'androidx.preference:preference-ktx:1.2.0' diff --git a/app/src/main/java/com/idormy/sms/forwarder/database/viewmodel/BaseViewModelFactory.kt b/app/src/main/java/com/idormy/sms/forwarder/database/viewmodel/BaseViewModelFactory.kt index 397dca27..df2d0372 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/database/viewmodel/BaseViewModelFactory.kt +++ b/app/src/main/java/com/idormy/sms/forwarder/database/viewmodel/BaseViewModelFactory.kt @@ -7,7 +7,7 @@ import com.idormy.sms.forwarder.database.AppDatabase class BaseViewModelFactory(private val context: Context?) : ViewModelProvider.Factory { - override fun create(modelClass: Class): T { + override fun create(modelClass: Class): T { if (context == null) throw IllegalArgumentException("Context CAN NOT BE null") diff --git a/app/src/main/res/layout/fragment_server.xml b/app/src/main/res/layout/fragment_server.xml index 8e73d32b..bde3000c 100644 --- a/app/src/main/res/layout/fragment_server.xml +++ b/app/src/main/res/layout/fragment_server.xml @@ -119,7 +119,7 @@ app:sb_ripple_color="@color/white" app:sb_ripple_duration="500" app:sb_shape_type="rectangle" - tools:ignore="SmallSp" /> + tools:ignore="PrivateResource,SmallSp" />