Use newer loader

Author: LaurentTreguier

app/src/legacy/kotlin/app/fyreplace/fyreplace/legacy/ui/ImageSelector.kt

@@ -28,13 +28,13 @@ import dagger.assisted.Assisted
 import dagger.assisted.AssistedInject
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.cancel
+import kotlinx.coroutines.currentCoroutineContext
 import kotlinx.coroutines.ensureActive
 import kotlinx.coroutines.withContext
 import java.io.ByteArrayOutputStream
 import java.io.File
 import java.io.IOException
 import java.io.InputStream
-import kotlin.coroutines.coroutineContext
 import kotlin.math.sqrt
 
 class ImageSelector @AssistedInject constructor(
@@ -133,7 +133,7 @@ class ImageSelector @AssistedInject constructor(
 
     private suspend fun onImageLoadingBegin() {
         val view = fragment.view ?: return
-        val context = coroutineContext
+        val context = currentCoroutineContext()
         snackbar = Snackbar.make(
             view, R.string.image_selector_snackbar_upload,
             Snackbar.LENGTH_INDEFINITE
@@ -200,7 +200,6 @@ class ImageSelector @AssistedInject constructor(
 
             compress()
 
-            @Suppress("AssignedValueIsNeverRead")
             if (os.size() > maxImageByteSize && compressFormat != CompressFormat.JPEG) {
                 compressFormat = CompressFormat.JPEG
                 compress()

app/src/legacy/kotlin/app/fyreplace/fyreplace/legacy/ui/views/ChaptersView.kt

@@ -13,7 +13,7 @@ import app.fyreplace.protos.Chapter
 import app.fyreplace.protos.Post
 import com.bumptech.glide.Glide
 import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions
-import com.google.android.material.progressindicator.CircularProgressIndicator
+import com.google.android.material.loadingindicator.LoadingIndicator
 
 @Suppress("unused")
 class ChaptersView : LinearLayout {
@@ -42,7 +42,7 @@ class ChaptersView : LinearLayout {
         removeAllViews()
 
         if (post.isPreview) {
-            val loader = CircularProgressIndicator(context).apply { isIndeterminate = true }
+            val loader = LoadingIndicator(context)
             val layoutParams = LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT)
             layoutParams.gravity = Gravity.CENTER_HORIZONTAL
             loader.layoutParams = layoutParams

app/src/legacy/res/layout/fragment_login.xml

@@ -111,11 +111,10 @@
                 android:text="@{vm.isRegistering ? @string/settings_register : @string/settings_login}"
                 android:visibility="@{vm.isLoading ? View.GONE : View.VISIBLE}" />
 
-            <com.google.android.material.progressindicator.CircularProgressIndicator
+            <com.google.android.material.loadingindicator.LoadingIndicator
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/gap"
-                android:indeterminate="true"
                 android:visibility="@{vm.isLoading ? View.VISIBLE : View.GONE}" />
         </LinearLayout>
     </ScrollView>

app/src/legacy/res/layout/item_comment_loader.xml

@@ -4,10 +4,8 @@
     android:layout_height="wrap_content"
     android:minHeight="@dimen/comment_height">
 
-    <com.google.android.material.progressindicator.CircularProgressIndicator
-        style="@style/Widget.Material3.CircularProgressIndicator.Small"
+    <com.google.android.material.loadingindicator.LoadingIndicator
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:indeterminate="true" />
+        android:layout_gravity="center" />
 </FrameLayout>