diff --git a/app.config.gradle b/app.config.gradle index 4b6d58873b66927824d21003434b39d12e54f85d..1dedc5ba73e6657354bfe1098206441c031096f0 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 b64747a13686531fe86d9c7ff38d795d92eb54b4..27c9d2268676523a9d1b1f4ec9d861a95738b426 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 cdd2437dbe3936735a5431b57bbe7267375dbf89..fb93f6e8a529afcc1bd92f6b6a760dfd1bb9b051 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 @@ + android:drawable="@drawable/res_icon_progress_bar" + android:duration="800" + android:fromDegrees="0" + android:pivotX="50%" + android:pivotY="50%" + android:toDegrees="1440" /> \ 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 ef1087a0068ba0b96930cfd30f30ca463c2a8b1f..3bafffa927c18cdaa940e9ee5beb881daa0821ea 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 @@ - @@ -7,12 +8,15 @@ + android:scaleType="centerCrop" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + 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" /> - \ No newline at end of file + \ 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 c1de63282afa60c3029510ff793e042ef304aa7b..b3ca009303fc222f72814b564b270d26ed2d3c3a 100644 --- a/common/commonRes/src/main/res/values/colors.xml +++ b/common/commonRes/src/main/res/values/colors.xml @@ -22,5 +22,5 @@ #ffffff #f5f5f5 #ff824c - #80f1f1f1 + #fff5f5f5 \ No newline at end of file