From ec7dcabdb8a1433b3ac4ebf2872ec55a08a69108 Mon Sep 17 00:00:00 2001
From: fankesyooni <qzmmcn@163.com>
Date: Sun, 9 Apr 2023 20:31:55 +0800
Subject: [PATCH] Added loading view and errors records count in
 AppErrorsRecordActivity, activity_app_errors_record

---
 .../errors/AppErrorsRecordActivity.kt         | 12 +++--
 .../res/layout/activity_app_errors_record.xml | 47 +++++++++++++++----
 2 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/app/src/main/java/com/fankes/apperrorstracking/ui/activity/errors/AppErrorsRecordActivity.kt b/app/src/main/java/com/fankes/apperrorstracking/ui/activity/errors/AppErrorsRecordActivity.kt
index 8b31f50..074082a 100644
--- a/app/src/main/java/com/fankes/apperrorstracking/ui/activity/errors/AppErrorsRecordActivity.kt
+++ b/app/src/main/java/com/fankes/apperrorstracking/ui/activity/errors/AppErrorsRecordActivity.kt
@@ -152,14 +152,16 @@ class AppErrorsRecordActivity : BaseActivity<ActivityAppErrorsRecordBinding>() {
     /** 更新列表数据 */
     private fun refreshData() {
         FrameworkTool.fetchAppErrorsInfoData(context = this) {
+            binding.titleCountText.text = LocaleString.recordCount(it.size)
+            binding.listProgressView.isVisible = false
+            binding.appErrorSisIcon.isVisible = it.size >= 5
+            binding.clearAllIcon.isVisible = it.isNotEmpty()
+            binding.exportAllIcon.isVisible = it.isNotEmpty()
+            binding.listView.isVisible = it.isNotEmpty()
+            binding.listNoDataView.isVisible = it.isEmpty()
             listData.clear()
             it.takeIf { e -> e.isNotEmpty() }?.forEach { e -> listData.add(e) }
             onChanged?.invoke()
-            binding.appErrorSisIcon.isVisible = listData.size >= 5
-            binding.clearAllIcon.isVisible = listData.isNotEmpty()
-            binding.exportAllIcon.isVisible = listData.isNotEmpty()
-            binding.listView.isVisible = listData.isNotEmpty()
-            binding.listNoDataView.isVisible = listData.isEmpty()
         }
     }
 
diff --git a/app/src/main/res/layout/activity_app_errors_record.xml b/app/src/main/res/layout/activity_app_errors_record.xml
index bba91f4..cbdee0f 100644
--- a/app/src/main/res/layout/activity_app_errors_record.xml
+++ b/app/src/main/res/layout/activity_app_errors_record.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -14,9 +15,9 @@
         android:elevation="0dp"
         android:gravity="center|start"
         android:paddingLeft="15dp"
-        android:paddingTop="15dp"
+        android:paddingTop="13dp"
         android:paddingRight="15dp"
-        android:paddingBottom="15dp">
+        android:paddingBottom="5dp">
 
         <androidx.constraintlayout.utils.widget.ImageFilterView
             android:id="@+id/title_back_icon"
@@ -29,16 +30,33 @@
             android:tint="@color/colorTextGray"
             android:tooltipText="@string/back" />
 
-        <TextView
+        <LinearLayout
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginEnd="2.5dp"
             android:layout_weight="1"
-            android:singleLine="true"
-            android:text="@string/errors_record"
-            android:textColor="@color/colorTextGray"
-            android:textSize="19sp"
-            android:textStyle="bold" />
+            android:gravity="center|start"
+            android:orientation="vertical">
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="5dp"
+                android:singleLine="true"
+                android:text="@string/errors_record"
+                android:textColor="@color/colorTextGray"
+                android:textSize="19sp"
+                android:textStyle="bold" />
+
+            <TextView
+                android:id="@+id/title_count_text"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:singleLine="true"
+                android:text="@string/loading"
+                android:textColor="@color/colorTextDark"
+                android:textSize="11.5sp" />
+        </LinearLayout>
 
         <androidx.constraintlayout.utils.widget.ImageFilterView
             android:id="@+id/app_error_sis_icon"
@@ -74,7 +92,15 @@
     <FrameLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginTop="5dp">
+        android:layout_marginTop="10dp">
+
+        <com.google.android.material.progressindicator.CircularProgressIndicator
+            android:id="@+id/list_progress_view"
+            android:layout_width="50dp"
+            android:layout_height="50dp"
+            android:layout_gravity="center"
+            android:indeterminate="true"
+            app:trackCornerRadius="10dp" />
 
         <TextView
             android:id="@+id/list_no_data_view"
@@ -85,7 +111,8 @@
             android:lineSpacingExtra="6dp"
             android:text="@string/no_list_data"
             android:textColor="@color/colorTextDark"
-            android:textSize="17sp" />
+            android:textSize="17sp"
+            android:visibility="gone" />
 
         <ListView
             android:id="@+id/list_view"