From f6029de3ad72a132e390dbd0af9b77cb3d7eb48a Mon Sep 17 00:00:00 2001
From: "16167479@qq.com" <16167479@qq.com>
Date: Thu, 28 Apr 2022 17:00:09 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B5=84=E6=BA=90=E5=92=8C=E9=A2=9C=E8=89=B2?=
 =?UTF-8?q?=E6=8A=BD=E5=8F=96=E4=B8=BA=E5=8F=AF=E8=A6=86=E7=9B=96=E7=9A=84?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                              |   4 ++--
 app/src/main/AndroidManifest.xml              |   6 ++++--
 build.gradle                                  |   4 ++--
 gradle/wrapper/gradle-wrapper.jar             | Bin 54417 -> 54329 bytes
 gradle/wrapper/gradle-wrapper.properties      |   3 ++-
 statelayout-library/build.gradle              |  14 ++------------
 .../java/com/lxj/statelayout/StateLayout.kt   |   4 ++--
 .../main/res/layout/_loading_layout_empty.xml |  11 +++++------
 .../main/res/layout/_loading_layout_error.xml |   6 +++---
 .../src/main/res/values-en/strings.xml        |   4 ++--
 .../src/main/res/values/colors.xml            |   4 ++++
 .../src/main/res/values/strings.xml           |   4 ++--
 12 files changed, 30 insertions(+), 34 deletions(-)
 create mode 100644 statelayout-library/src/main/res/values/colors.xml

diff --git a/app/build.gradle b/app/build.gradle
index 28cd0d7..86a38fa 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -5,11 +5,11 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion 31
     defaultConfig {
         applicationId "com.lxj.demo1"
         minSdkVersion 19
-        targetSdkVersion 28
+        targetSdkVersion 31
         versionCode 1
         versionName "1.0"
     }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 80bf7b5..b4d3012 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -9,7 +9,8 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-        <activity android:name="com.lxj.demo1.MainActivity" >
+        <activity android:name="com.lxj.demo1.MainActivity"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -17,7 +18,8 @@
             </intent-filter>
         </activity>
 
-        <activity android:name="com.lxj.demo1.InFragmentDemo"/>
+        <activity android:name="com.lxj.demo1.InFragmentDemo"
+            android:exported="true"/>
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index d1f0ee3..d8a08b8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,13 +1,13 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.3.41'
+    ext.kotlin_version = '1.5.0'
     repositories {
         google()
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.3'
+        classpath 'com.android.tools.build:gradle:4.2.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 758de960ec7947253b058ff79c88ce51f3abe08a..f6b961fd5a86aa5fbfe90f707c3138408be7c718 100644
GIT binary patch
delta 7527
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
CI$tUP

delta 7592
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

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 0ebb310..bff4ad5 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
+#Wed Dec 18 19:13:30 CST 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
diff --git a/statelayout-library/build.gradle b/statelayout-library/build.gradle
index a7a2485..5c0223a 100644
--- a/statelayout-library/build.gradle
+++ b/statelayout-library/build.gradle
@@ -2,11 +2,11 @@ apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 31
 
     defaultConfig {
         minSdkVersion 19
-        targetSdkVersion 28
+        targetSdkVersion 31
         versionCode 1
         versionName "1.0"
     }
@@ -24,13 +24,3 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation 'androidx.appcompat:appcompat:1.3.1'
 }
-
-//publish {
-//    userOrg = 'li-xiaojun'
-//    groupId = 'com.lxj'
-//    artifactId = 'statelayout'
-//    publishVersion = '1.2.2'
-//    repoName = 'jrepo'
-//    desc = 'Simple way to change your layout state, like loading, _statelayout_empty, _statelayout_error. Strong customizitaion, written by Kotlin!'
-//    website = 'https://github.com/li-xiaojun/StateLayout'
-//}
\ No newline at end of file
diff --git a/statelayout-library/src/main/java/com/lxj/statelayout/StateLayout.kt b/statelayout-library/src/main/java/com/lxj/statelayout/StateLayout.kt
index 5c4f7d5..ba9fc8c 100644
--- a/statelayout-library/src/main/java/com/lxj/statelayout/StateLayout.kt
+++ b/statelayout-library/src/main/java/com/lxj/statelayout/StateLayout.kt
@@ -171,10 +171,10 @@ class StateLayout @JvmOverloads constructor(context: Context, attributeSet: Attr
 
     private fun switch(v: View?) {
         if (switchTask != null) {
-            mHandler.removeCallbacks(switchTask)
+            mHandler.removeCallbacks(switchTask!!)
         }
         switchTask = SwitchTask(v)
-        mHandler.post(switchTask)
+        mHandler.post(switchTask!!)
     }
 
     private fun retry() {
diff --git a/statelayout-library/src/main/res/layout/_loading_layout_empty.xml b/statelayout-library/src/main/res/layout/_loading_layout_empty.xml
index f0214dd..b1aa33d 100644
--- a/statelayout-library/src/main/res/layout/_loading_layout_empty.xml
+++ b/statelayout-library/src/main/res/layout/_loading_layout_empty.xml
@@ -3,15 +3,14 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:paddingBottom="30dp"
     android:gravity="center"
     android:orientation="vertical">
 
     <ImageView
         android:id="@+id/ivNoDataIcon"
         android:src="@drawable/_statelayout_empty"
-        android:layout_width="64dp"
-        android:layout_height="64dp"
+        android:layout_width="60dp"
+        android:layout_height="60dp"
         android:layout_gravity="center"/>
 
     <TextView
@@ -20,7 +19,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
-        android:textColor="#444"
-        android:textSize="15sp"
-        android:text="@string/nodata"/>
+        android:textColor="@color/_statelayout_hint_color"
+        android:textSize="14sp"
+        android:text="@string/_statelayout_nodata"/>
 </LinearLayout>
\ No newline at end of file
diff --git a/statelayout-library/src/main/res/layout/_loading_layout_error.xml b/statelayout-library/src/main/res/layout/_loading_layout_error.xml
index 19f2369..f245a6b 100644
--- a/statelayout-library/src/main/res/layout/_loading_layout_error.xml
+++ b/statelayout-library/src/main/res/layout/_loading_layout_error.xml
@@ -18,9 +18,9 @@
         android:layout_gravity="center"
         android:paddingLeft="14dp"
         android:paddingRight="14dp"
-        android:textSize="12sp"
+        android:textSize="14sp"
         android:layout_marginTop="15dp"
-        android:text="@string/load_failed_try_again"
-        android:textColor="#444"/>
+        android:text="@string/_statelayout_load_failed"
+        android:textColor="@color/_statelayout_hint_color"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/statelayout-library/src/main/res/values-en/strings.xml b/statelayout-library/src/main/res/values-en/strings.xml
index b025638..951c5a2 100644
--- a/statelayout-library/src/main/res/values-en/strings.xml
+++ b/statelayout-library/src/main/res/values-en/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="load_failed_try_again">Load failed, try again</string>
-    <string name="nodata">No Data</string>
+    <string name="_statelayout_load_failed">Click to retry</string>
+    <string name="_statelayout_nodata">No Data</string>
 </resources>
\ No newline at end of file
diff --git a/statelayout-library/src/main/res/values/colors.xml b/statelayout-library/src/main/res/values/colors.xml
new file mode 100644
index 0000000..e56f2de
--- /dev/null
+++ b/statelayout-library/src/main/res/values/colors.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="_statelayout_hint_color">#656565</color>
+</resources>
\ No newline at end of file
diff --git a/statelayout-library/src/main/res/values/strings.xml b/statelayout-library/src/main/res/values/strings.xml
index 40703b3..deb3c16 100644
--- a/statelayout-library/src/main/res/values/strings.xml
+++ b/statelayout-library/src/main/res/values/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="load_failed_try_again">加载失败，点击重试</string>
-    <string name="nodata">暂无数据</string>
+    <string name="_statelayout_load_failed">点击重试</string>
+    <string name="_statelayout_nodata">暂无数据</string>
 </resources>
\ No newline at end of file