From 0bd978d6b7f9d169f40f02b4569ee40816c2433a Mon Sep 17 00:00:00 2001
From: gedoor <gekunfei@live.com>
Date: Wed, 25 Aug 2021 20:28:08 +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                                            | 3 ++-
 .../main/java/io/legado/app/ui/login/SourceLoginActivity.kt | 6 +++---
 app/src/main/res/layout/activity_source_login.xml           | 3 ++-
 app/src/main/res/layout/activity_translucence.xml           | 6 +++---
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 0589353f9..1d1b83bb5 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -182,7 +182,8 @@ dependencies {
 
     //网络
     implementation('com.squareup.okhttp3:okhttp:4.9.1')
-    implementation(fileTree(dir: 'cronetlib', include: ['*.jar', '*.aar']))
+    appImplementation(fileTree(dir: 'cronetlib', include: ['*.jar', '*.aar']))
+    googleImplementation 'com.google.android.gms:play-services-cronet:17.0.0'
 
     //Glide
     implementation('com.github.bumptech.glide:glide:4.12.0')
diff --git a/app/src/main/java/io/legado/app/ui/login/SourceLoginActivity.kt b/app/src/main/java/io/legado/app/ui/login/SourceLoginActivity.kt
index 5042ee624..cbd7ebe23 100644
--- a/app/src/main/java/io/legado/app/ui/login/SourceLoginActivity.kt
+++ b/app/src/main/java/io/legado/app/ui/login/SourceLoginActivity.kt
@@ -3,16 +3,16 @@ package io.legado.app.ui.login
 import android.os.Bundle
 import androidx.activity.viewModels
 import io.legado.app.R
-import io.legado.app.base.BaseActivity
+import io.legado.app.base.VMBaseActivity
 import io.legado.app.data.entities.BookSource
 import io.legado.app.databinding.ActivitySourceLoginBinding
 import io.legado.app.utils.viewbindingdelegate.viewBinding
 
 
-class SourceLoginActivity : BaseActivity<ActivitySourceLoginBinding>() {
+class SourceLoginActivity : VMBaseActivity<ActivitySourceLoginBinding, SourceLoginViewModel>() {
 
     override val binding by viewBinding(ActivitySourceLoginBinding::inflate)
-    private val viewModel by viewModels<SourceLoginViewModel>()
+    override val viewModel by viewModels<SourceLoginViewModel>()
 
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         intent.getStringExtra("sourceUrl")?.let {
diff --git a/app/src/main/res/layout/activity_source_login.xml b/app/src/main/res/layout/activity_source_login.xml
index 365277d30..ea051953b 100644
--- a/app/src/main/res/layout/activity_source_login.xml
+++ b/app/src/main/res/layout/activity_source_login.xml
@@ -3,6 +3,7 @@
     android:id="@+id/fl_fragment"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    android:background="@color/transparent50">
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_translucence.xml b/app/src/main/res/layout/activity_translucence.xml
index 946439b5d..143f44d2a 100644
--- a/app/src/main/res/layout/activity_translucence.xml
+++ b/app/src/main/res/layout/activity_translucence.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:background="@color/transparent50">
 
     <io.legado.app.ui.widget.anima.RotateLoading
@@ -11,10 +11,10 @@
         android:layout_height="36dp"
         android:layout_margin="6dp"
         android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
         app:loading_width="2dp" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file