Merge branch 'devel' into feature/nextgen

app/src/main/java/org/koitharu/kotatsu/utils/GoneOnInvisibleListener.kt

@@ -0,0 +1,23 @@
+package org.koitharu.kotatsu.utils
+
+import android.view.View
+import android.view.ViewTreeObserver
+
+/**
+ * ProgressIndicator become INVISIBLE instead of GONE by hide() call.
+ * It`s final so we need this workaround
+ */
+class GoneOnInvisibleListener(
+	private val view: View,
+) : ViewTreeObserver.OnGlobalLayoutListener {
+
+	override fun onGlobalLayout() {
+		if (view.visibility == View.INVISIBLE) {
+			view.visibility = View.GONE
+		}
+	}
+
+	fun attach() {
+		view.viewTreeObserver.addOnGlobalLayoutListener(this)
+	}
+}

app/src/main/java/org/koitharu/kotatsu/utils/ext/AndroidExt.kt

@@ -11,8 +11,6 @@ import android.content.pm.ResolveInfo
 import android.database.SQLException
 import android.graphics.Color
 import android.net.ConnectivityManager
-import android.net.Network
-import android.net.NetworkRequest
 import android.net.Uri
 import android.os.Build
 import android.provider.Settings
@@ -29,7 +27,6 @@ import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.coroutineScope
 import androidx.work.CoroutineWorker
 import com.google.android.material.elevation.ElevationOverlayProvider
-import kotlin.coroutines.resume
 import kotlin.math.roundToLong
 import kotlinx.coroutines.channels.awaitClose
 import kotlinx.coroutines.channels.trySendBlocking
@@ -39,7 +36,6 @@ import kotlinx.coroutines.flow.callbackFlow
 import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.launch
-import kotlinx.coroutines.suspendCancellableCoroutine
 import okio.IOException
 import org.json.JSONException
 import org.koitharu.kotatsu.BuildConfig
@@ -51,28 +47,6 @@ val Context.activityManager: ActivityManager?
 val Context.connectivityManager: ConnectivityManager
 	get() = getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
 
-suspend fun ConnectivityManager.waitForNetwork(): Network {
-	val request = NetworkRequest.Builder().build()
-	if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-		// fast path
-		activeNetwork?.let { return it }
-	}
-	return suspendCancellableCoroutine { cont ->
-		val callback = object : ConnectivityManager.NetworkCallback() {
-			override fun onAvailable(network: Network) {
-				unregisterNetworkCallback(this)
-				if (cont.isActive) {
-					cont.resume(network)
-				}
-			}
-		}
-		registerNetworkCallback(request, callback)
-		cont.invokeOnCancellation {
-			unregisterNetworkCallback(callback)
-		}
-	}
-}
-
 fun String.toUriOrNull() = if (isEmpty()) null else Uri.parse(this)
 
 suspend fun CoroutineWorker.trySetForeground(): Boolean = runCatching {

app/src/main/java/org/koitharu/kotatsu/utils/ext/ViewExt.kt

@@ -160,8 +160,6 @@ fun RecyclerView.invalidateNestedItemDecorations() {
 	}
 }
 
-internal val View.compatPaddingStart get() = ViewCompat.getPaddingStart(this)
-
 val View.parents: Sequence<ViewParent>
 	get() = sequence {
 		var p: ViewParent? = parent

app/src/main/java/org/koitharu/kotatsu/utils/progress/PausingProgressJob.kt

@@ -0,0 +1,26 @@
+package org.koitharu.kotatsu.utils.progress
+
+import androidx.annotation.AnyThread
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.flow.StateFlow
+import org.koitharu.kotatsu.download.ui.service.PausingHandle
+
+class PausingProgressJob<P>(
+	job: Job,
+	progress: StateFlow<P>,
+	private val pausingHandle: PausingHandle,
+) : ProgressJob<P>(job, progress) {
+
+	@get:AnyThread
+	val isPaused: Boolean
+		get() = pausingHandle.isPaused
+
+	@AnyThread
+	suspend fun awaitResumed() = pausingHandle.awaitResumed()
+
+	@AnyThread
+	fun pause() = pausingHandle.pause()
+
+	@AnyThread
+	fun resume() = pausingHandle.resume()
+}

app/src/main/java/org/koitharu/kotatsu/utils/progress/ProgressJob.kt

@@ -4,7 +4,7 @@ import kotlinx.coroutines.Job
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.StateFlow
 
-class ProgressJob<P>(
+open class ProgressJob<P>(
 	private val job: Job,
 	private val progress: StateFlow<P>,
 ) : Job by job {