From 47486d28b16cef868d14860fad483aec5dd1a0c5 Mon Sep 17 00:00:00 2001
From: code-guy <1952110078@qq.com>
Date: Sun, 7 Aug 2022 10:29:32 +0800
Subject: [PATCH] =?UTF-8?q?`gradle=20=E5=8D=87=E7=BA=A7=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E9=83=A8=E5=88=86=E4=BB=A3=E7=A0=81`?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.config.gradle                             |  2 +-
 build.gradle                                  |  4 +--
 .../main/res/drawable/res_bg_progress_bar.xml |  9 ++++---
 .../res/layout/res_common_loading_view.xml    | 25 ++++++++++++-------
 .../commonRes/src/main/res/values/colors.xml  |  2 +-
 5 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/app.config.gradle b/app.config.gradle
index 4b6d588..1dedc5b 100644
--- a/app.config.gradle
+++ b/app.config.gradle
@@ -109,7 +109,7 @@ rootProject.ext {
             "navigation-compose"         : "androidx.navigation:navigation-compose:2.4.2",
             "lifecycle-viewmodel-compose": "androidx.lifecycle:lifecycle-viewmodel-compose:2.4.1",
             "accompanist-swiperefresh"   : "com.google.accompanist:accompanist-swiperefresh:0.18.0",
-            "constraintlayout-compose"   : 'androidx.constraintlayout:constraintlayout-compose:1.1.0-alpha03'
+            "constraintlayout-compose"   : "androidx.constraintlayout:constraintlayout-compose:1.0.1"
     ]
 
 
diff --git a/build.gradle b/build.gradle
index b64747a..27c9d22 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,8 +1,8 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 plugins {
-    id 'com.android.application' version '7.2.1' apply false
-    id 'com.android.library' version '7.2.1' apply false
+    id 'com.android.application' version '7.2.2' apply false
+    id 'com.android.library' version '7.2.2' apply false
     id 'org.jetbrains.kotlin.android' version '1.5.31' apply false
 }
 // 导入配置
diff --git a/common/commonRes/src/main/res/drawable/res_bg_progress_bar.xml b/common/commonRes/src/main/res/drawable/res_bg_progress_bar.xml
index cdd2437..fb93f6e 100644
--- a/common/commonRes/src/main/res/drawable/res_bg_progress_bar.xml
+++ b/common/commonRes/src/main/res/drawable/res_bg_progress_bar.xml
@@ -2,8 +2,11 @@
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
         <rotate
-                android:drawable="@drawable/res_icon_progress_bar"
-                android:fromDegrees="0"
-                android:toDegrees="1440" />
+            android:drawable="@drawable/res_icon_progress_bar"
+            android:duration="800"
+            android:fromDegrees="0"
+            android:pivotX="50%"
+            android:pivotY="50%"
+            android:toDegrees="1440" />
     </item>
 </layer-list>
\ No newline at end of file
diff --git a/common/commonRes/src/main/res/layout/res_common_loading_view.xml b/common/commonRes/src/main/res/layout/res_common_loading_view.xml
index ef1087a..3bafffa 100644
--- a/common/commonRes/src/main/res/layout/res_common_loading_view.xml
+++ b/common/commonRes/src/main/res/layout/res_common_loading_view.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<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"
     android:background="@color/res_color_bg_state_view">
@@ -7,12 +8,15 @@
 
     <ProgressBar
         android:id="@+id/pb"
-        android:layout_width="50dp"
-        android:layout_height="50dp"
+        android:layout_width="30dp"
+        android:layout_height="30dp"
         android:layout_gravity="center"
-        android:layout_marginBottom="50dp"
         android:indeterminateDrawable="@drawable/res_bg_progress_bar"
-        android:scaleType="centerCrop" />
+        android:scaleType="centerCrop"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
     <TextView
         android:id="@+id/tv_name"
@@ -21,8 +25,11 @@
         android:layout_gravity="center"
         android:layout_marginTop="30dp"
         android:text="数据加载中···"
-        android:textColor="@color/res_color_text_hint"
-        android:textSize="15sp"
-        android:textStyle="bold" />
+        android:textColor="@color/res_color_font_main"
+        android:textSize="13sp"
+        android:textStyle="bold"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/pb" />
 
-</FrameLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/common/commonRes/src/main/res/values/colors.xml b/common/commonRes/src/main/res/values/colors.xml
index c1de632..b3ca009 100644
--- a/common/commonRes/src/main/res/values/colors.xml
+++ b/common/commonRes/src/main/res/values/colors.xml
@@ -22,5 +22,5 @@
     <color name="res_color_bg_list_item">#ffffff</color>
     <color name="res_color_bg_edit">#f5f5f5</color>
     <color name="res_color_ff824c">#ff824c</color>
-    <color name="res_color_bg_state_view">#80f1f1f1</color>
+    <color name="res_color_bg_state_view">#fff5f5f5</color>
 </resources>
\ No newline at end of file
-- 
Gitee