From b9e108eb4d7e93deb6bc8bd6ed32220c780d2576 Mon Sep 17 00:00:00 2001
From: arkon <eugcheung94@gmail.com>
Date: Thu, 30 Jun 2022 22:13:31 -0400
Subject: [PATCH] Revert some KTX extension changes

These weren't exactly 1:1 replacements. Might be related to #7391.
---
 .../eu/kanade/tachiyomi/ui/reader/PageIndicatorTextView.kt  | 6 +++---
 .../ui/reader/viewer/pager/PagerTransitionHolder.kt         | 3 +--
 .../eu/kanade/tachiyomi/widget/TachiyomiAppBarLayout.kt     | 3 +--
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/PageIndicatorTextView.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/PageIndicatorTextView.kt
index 5a977fb8b..d0cd94f2a 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/PageIndicatorTextView.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/PageIndicatorTextView.kt
@@ -3,11 +3,11 @@ package eu.kanade.tachiyomi.ui.reader
 import android.annotation.SuppressLint
 import android.content.Context
 import android.graphics.Color
+import android.text.Spannable
 import android.text.SpannableString
 import android.text.style.ScaleXSpan
 import android.util.AttributeSet
 import androidx.appcompat.widget.AppCompatTextView
-import androidx.core.text.set
 import eu.kanade.tachiyomi.widget.OutlineSpan
 
 /**
@@ -31,10 +31,10 @@ class PageIndicatorTextView(
         // Also add a bit of spacing between each character, as the stroke overlaps them
         val finalText = SpannableString(currText.asIterable().joinToString("\u00A0")).apply {
             // Apply text outline
-            set(1, length - 1, spanOutline)
+            setSpan(spanOutline, 1, length - 1, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
 
             for (i in 1..lastIndex step 2) {
-                set(i, i + 1, ScaleXSpan(0.2f))
+                setSpan(ScaleXSpan(0.2f), i, i + 1, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
             }
         }
 
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerTransitionHolder.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerTransitionHolder.kt
index 552755a1c..9f712c2da 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerTransitionHolder.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerTransitionHolder.kt
@@ -9,7 +9,6 @@ import android.view.ViewGroup.LayoutParams.MATCH_PARENT
 import android.view.ViewGroup.LayoutParams.WRAP_CONTENT
 import android.widget.LinearLayout
 import androidx.appcompat.widget.AppCompatTextView
-import androidx.core.view.updatePadding
 import com.google.android.material.progressindicator.CircularProgressIndicator
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.ui.reader.model.ChapterTransition
@@ -56,7 +55,7 @@ class PagerTransitionHolder(
         orientation = VERTICAL
         gravity = Gravity.CENTER
         val sidePadding = 64.dpToPx
-        updatePadding(left = sidePadding, right = sidePadding)
+        setPadding(sidePadding, 0, sidePadding, 0)
 
         val transitionView = ReaderTransitionView(context)
         addView(transitionView)
diff --git a/app/src/main/java/eu/kanade/tachiyomi/widget/TachiyomiAppBarLayout.kt b/app/src/main/java/eu/kanade/tachiyomi/widget/TachiyomiAppBarLayout.kt
index 4af26d74c..eb89e027f 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/widget/TachiyomiAppBarLayout.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/widget/TachiyomiAppBarLayout.kt
@@ -12,7 +12,6 @@ import android.util.AttributeSet
 import android.view.animation.LinearInterpolator
 import android.widget.TextView
 import androidx.annotation.FloatRange
-import androidx.core.graphics.drawable.updateBounds
 import androidx.core.graphics.withTranslation
 import androidx.lifecycle.coroutineScope
 import androidx.lifecycle.findViewTreeLifecycleOwner
@@ -93,7 +92,7 @@ class TachiyomiAppBarLayout @JvmOverloads constructor(
 
     override fun onLayout(changed: Boolean, l: Int, t: Int, r: Int, b: Int) {
         super.onLayout(changed, l, t, r, b)
-        statusBarForeground?.updateBounds(right = width, bottom = paddingTop)
+        statusBarForeground?.setBounds(0, 0, width, paddingTop)
     }
 
     override fun onOffsetChanged(offset: Int) {