From b0f87fdd2193b53b06976da7c45e9da2cfd66a4b Mon Sep 17 00:00:00 2001
From: Ivan Iskandar <12537387+ivaniskandar@users.noreply.github.com>
Date: Sun, 3 Oct 2021 23:00:00 +0700
Subject: [PATCH] LicensesController: Move item init to IO thread (#6020)

---
 .../ui/more/licenses/LicensesController.kt    | 20 +++++++++++++----
 .../main/res/layout/licenses_controller.xml   | 22 +++++++++++++++----
 2 files changed, 34 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/more/licenses/LicensesController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/more/licenses/LicensesController.kt
index ba0261529..0dd4b0852 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/more/licenses/LicensesController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/more/licenses/LicensesController.kt
@@ -9,6 +9,8 @@ import eu.davidea.flexibleadapter.FlexibleAdapter
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.databinding.LicensesControllerBinding
 import eu.kanade.tachiyomi.ui.base.controller.BaseController
+import eu.kanade.tachiyomi.util.lang.launchUI
+import eu.kanade.tachiyomi.util.lang.withIOContext
 import eu.kanade.tachiyomi.util.system.openInBrowser
 
 class LicensesController :
@@ -30,15 +32,25 @@ class LicensesController :
                 padding()
             }
         }
+        binding.progress.applyInsetter {
+            type(navigationBars = true) {
+                padding()
+            }
+        }
 
         binding.recycler.layoutManager = LinearLayoutManager(view.context)
         adapter = LicensesAdapter(this)
         binding.recycler.adapter = adapter
 
-        val licenseItems = Libs(view.context).libraries
-            .sortedBy { it.libraryName.lowercase() }
-            .map { LicensesItem(it) }
-        adapter?.updateDataSet(licenseItems)
+        viewScope.launchUI {
+            val licenseItems = withIOContext {
+                Libs(view.context).libraries
+                    .sortedBy { it.libraryName.lowercase() }
+                    .map { LicensesItem(it) }
+            }
+            binding.progress.hide()
+            adapter?.updateDataSet(licenseItems)
+        }
     }
 
     override fun onDestroyView(view: View) {
diff --git a/app/src/main/res/layout/licenses_controller.xml b/app/src/main/res/layout/licenses_controller.xml
index 56f53173f..0ae6429e9 100644
--- a/app/src/main/res/layout/licenses_controller.xml
+++ b/app/src/main/res/layout/licenses_controller.xml
@@ -1,7 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.recyclerview.widget.RecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/recycler"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    tools:listitem="@layout/licenses_item" />
+    android:layout_height="wrap_content">
+
+    <com.google.android.material.progressindicator.CircularProgressIndicator
+        android:id="@+id/progress"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerInParent="true"
+        android:indeterminate="true" />
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/recycler"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:clipToPadding="false"
+        tools:listitem="@layout/licenses_item" />
+
+</RelativeLayout>