Draff/TachiyomiSY-Plus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use Compose for OAuth login loading indicator

Browse Source 
(cherry picked from commit ccff333123d9f446d4456f8d43fa0472fb82c488)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/sources/MigrationSourcesController.kt
This commit is contained in:
arkon 2022-04-28 18:55:35 -04:00 committed by Jobobby04
parent 4d8ba5868c
commit 12a0e40ca5
2 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/sources/MigrationSourcesController.kt
View File

@ -27,8 +27,7 @@ class MigrationSourcesController : ComposeController<MigrationSourcesPresenter>(
setHasOptionsMenu(true) setHasOptionsMenu(true)
} }
override fun createPresenter(): MigrationSourcesPresenter = override fun createPresenter() = MigrationSourcesPresenter()
MigrationSourcesPresenter()
@Composable @Composable
override fun ComposeContent(nestedScrollInterop: NestedScrollConnection) { override fun ComposeContent(nestedScrollInterop: NestedScrollConnection) {

26
app/src/main/java/eu/kanade/tachiyomi/ui/setting/track/BaseOAuthLoginActivity.kt
View File

@ -3,10 +3,9 @@ package eu.kanade.tachiyomi.ui.setting.track
import android.content.Intent import android.content.Intent
import android.net.Uri import android.net.Uri
import android.os.Bundle import android.os.Bundle
import android.view.Gravity import androidx.activity.compose.setContent
import android.view.ViewGroup import eu.kanade.presentation.components.LoadingScreen
import android.widget.FrameLayout import eu.kanade.presentation.theme.TachiyomiTheme
import android.widget.ProgressBar
import eu.kanade.tachiyomi.data.track.TrackManager import eu.kanade.tachiyomi.data.track.TrackManager
import eu.kanade.tachiyomi.ui.base.activity.BaseActivity import eu.kanade.tachiyomi.ui.base.activity.BaseActivity
import eu.kanade.tachiyomi.ui.main.MainActivity import eu.kanade.tachiyomi.ui.main.MainActivity
@ -21,15 +20,11 @@ abstract class BaseOAuthLoginActivity : BaseActivity() {
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
val view = ProgressBar(this) setContent {
setContentView( TachiyomiTheme {
view, LoadingScreen()
FrameLayout.LayoutParams( }
ViewGroup.LayoutParams.WRAP_CONTENT, }
ViewGroup.LayoutParams.WRAP_CONTENT,
Gravity.CENTER,
),
)
handleResult(intent.data) handleResult(intent.data)
} }
@ -37,8 +32,9 @@ abstract class BaseOAuthLoginActivity : BaseActivity() {
internal fun returnToSettings() { internal fun returnToSettings() {
finish() finish()
val intent = Intent(this, MainActivity::class.java) val intent = Intent(this, MainActivity::class.java).apply {
intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP) addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP)
}
startActivity(intent) startActivity(intent)
} }
} }