diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/sources/MigrationSourcesController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/sources/MigrationSourcesController.kt index c793c7c75..3b03e966d 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/sources/MigrationSourcesController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/sources/MigrationSourcesController.kt @@ -19,8 +19,7 @@ class MigrationSourcesController : ComposeController( setHasOptionsMenu(true) } - override fun createPresenter(): MigrationSourcesPresenter = - MigrationSourcesPresenter() + override fun createPresenter() = MigrationSourcesPresenter() @Composable override fun ComposeContent(nestedScrollInterop: NestedScrollConnection) { @@ -38,7 +37,7 @@ class MigrationSourcesController : ComposeController( onLongClickItem = { source -> val sourceId = source.id.toString() activity?.copyToClipboard(sourceId, sourceId) - } + }, ) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/track/BaseOAuthLoginActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/track/BaseOAuthLoginActivity.kt index 2c665a6bd..6f85bb498 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/track/BaseOAuthLoginActivity.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/track/BaseOAuthLoginActivity.kt @@ -3,10 +3,9 @@ package eu.kanade.tachiyomi.ui.setting.track import android.content.Intent import android.net.Uri import android.os.Bundle -import android.view.Gravity -import android.view.ViewGroup -import android.widget.FrameLayout -import android.widget.ProgressBar +import androidx.activity.compose.setContent +import eu.kanade.presentation.components.LoadingScreen +import eu.kanade.presentation.theme.TachiyomiTheme import eu.kanade.tachiyomi.data.track.TrackManager import eu.kanade.tachiyomi.ui.base.activity.BaseActivity import eu.kanade.tachiyomi.ui.main.MainActivity @@ -21,15 +20,11 @@ abstract class BaseOAuthLoginActivity : BaseActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - val view = ProgressBar(this) - setContentView( - view, - FrameLayout.LayoutParams( - ViewGroup.LayoutParams.WRAP_CONTENT, - ViewGroup.LayoutParams.WRAP_CONTENT, - Gravity.CENTER, - ), - ) + setContent { + TachiyomiTheme { + LoadingScreen() + } + } handleResult(intent.data) } @@ -37,8 +32,9 @@ abstract class BaseOAuthLoginActivity : BaseActivity() { internal fun returnToSettings() { finish() - val intent = Intent(this, MainActivity::class.java) - intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP) + val intent = Intent(this, MainActivity::class.java).apply { + addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP) + } startActivity(intent) } }