admin/TachiyomiSY
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge Voyager screens (#8656)

Browse Source 
* Merge Voyager screens

* cleanups

(cherry picked from commit 3d66eaea83)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/components/MangaBottomActionMenu.kt
#	app/src/main/java/eu/kanade/presentation/more/settings/screen/AboutScreen.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/base/changehandler/OneWayFadeChangeHandler.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/base/controller/ConductorExtensions.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/MigrateSearchScreen.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SourceSearchController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SourceSearchScreen.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourcesFilterController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourcesTab.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceScreen.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/category/CategoryScreen.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/download/DownloadController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibrarySettingsSheet.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryTab.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/main/WhatsNewDialogController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreen.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/more/MoreTab.kt
#	app/src/main/res/layout/main_activity.xml
This commit is contained in:
Ivan Iskandar
2022-12-03 10:35:30 +07:00
committed by Jobobby04
parent 07c7ec972d
commit 726626f2c5
120 changed files with 1685 additions and 3009 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/exh/uconfig/ConfiguringDialogController.kt
-75
View File
@@ -1,75 +0,0 @@
package exh.uconfig
import android.app.Dialog
import android.os.Bundle
import android.view.View
import androidx.appcompat.app.AlertDialog
import com.google.android.material.dialog.MaterialAlertDialogBuilder
import eu.kanade.tachiyomi.R
import eu.kanade.tachiyomi.ui.base.controller.DialogController
import eu.kanade.tachiyomi.util.lang.launchIO
import eu.kanade.tachiyomi.util.lang.launchUI
import eu.kanade.tachiyomi.util.system.toast
import exh.log.xLogE
import kotlinx.coroutines.MainScope
import kotlinx.coroutines.cancel
class ConfiguringDialogController : DialogController() {
private var materialDialog: AlertDialog? = null
val scope = MainScope()
override fun onCreateDialog(savedViewState: Bundle?): Dialog {
if (savedViewState == null) {
scope.launchIO {
try {
EHConfigurator(activity!!).configureAll()
launchUI {
activity?.toast(R.string.eh_settings_successfully_uploaded)
}
} catch (e: Exception) {
launchUI {
activity?.let {
MaterialAlertDialogBuilder(it)
.setTitle(R.string.eh_settings_configuration_failed)
.setMessage(it.getString(R.string.eh_settings_configuration_failed_message, e.message))
.setPositiveButton(android.R.string.ok, null)
.show()
}
}
this@ConfiguringDialogController.xLogE("Configuration error!", e)
}
launchUI {
finish()
}
}
}
return MaterialAlertDialogBuilder(activity!!)
.setTitle(R.string.eh_settings_uploading_to_server)
.setMessage(R.string.eh_settings_uploading_to_server_message)
.setCancelable(false)
.create()
.also {
materialDialog = it
}
}
override fun onDestroyView(view: View) {
super.onDestroyView(view)
materialDialog = null
}
override fun onDestroy() {
super.onDestroy()
scope.cancel()
}
override fun onRestoreInstanceState(savedInstanceState: Bundle) {
super.onRestoreInstanceState(savedInstanceState)
finish()
}
fun finish() {
router.popController(this)
}
}
app/src/main/java/exh/uconfig/WarnConfigureDialogController.kt
-37
View File
@@ -1,37 +0,0 @@
package exh.uconfig
import android.app.Dialog
import android.os.Bundle
import com.bluelinelabs.conductor.Router
import com.google.android.material.dialog.MaterialAlertDialogBuilder
import eu.kanade.domain.UnsortedPreferences
import eu.kanade.tachiyomi.R
import eu.kanade.tachiyomi.ui.base.controller.DialogController
import uy.kohesive.injekt.Injekt
import uy.kohesive.injekt.api.get
import uy.kohesive.injekt.injectLazy
class WarnConfigureDialogController : DialogController() {
private val prefs: UnsortedPreferences by injectLazy()
override fun onCreateDialog(savedViewState: Bundle?): Dialog {
return MaterialAlertDialogBuilder(activity!!)
.setTitle(R.string.settings_profile_note)
.setMessage(R.string.settings_profile_note_message)
.setPositiveButton(android.R.string.ok) { _, _ ->
prefs.exhShowSettingsUploadWarning().set(false)
ConfiguringDialogController().showDialog(router)
}
.setCancelable(false)
.create()
}
companion object {
fun uploadSettings(router: Router) {
if (Injekt.get<UnsortedPreferences>().exhShowSettingsUploadWarning().get()) {
WarnConfigureDialogController().showDialog(router)
} else {
ConfiguringDialogController().showDialog(router)
}
}
}
}