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

Change settings screen to object (#8604)

Browse Source 
(cherry picked from commit 7d34ff214cad896abc2a834300d632ddce0a732f)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/more/settings/screen/AboutScreen.kt
#	app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsMainScreen.kt
#	app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsSearchScreen.kt
This commit is contained in:
Ivan Iskandar 2022-11-23 21:14:55 +07:00 committed by Jobobby04
parent 36b1b4ed5f
commit 46b0bec926
16 changed files with 171 additions and 175 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/eu/kanade/presentation/more/settings/screen/AboutScreen.kt
View File

@ -54,7 +54,7 @@ import java.text.SimpleDateFormat
import java.util.Locale
import java.util.TimeZone
class AboutScreen : Screen {
object AboutScreen : Screen {
@Composable
override fun Content() {
@ -205,7 +205,6 @@ class AboutScreen : Screen {
}
}
companion object {
fun getVersionName(withBuildDate: Boolean): String {
return when {
BuildConfig.DEBUG -> {
@ -258,5 +257,4 @@ class AboutScreen : Screen {
BuildConfig.BUILD_TIME
}
}
}
}

4
app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsAdvancedScreen.kt
View File

@ -98,7 +98,7 @@ import uy.kohesive.injekt.Injekt
import uy.kohesive.injekt.api.get
import java.io.File
class SettingsAdvancedScreen : SearchableSettings {
object SettingsAdvancedScreen : SearchableSettings {
@ReadOnlyComposable
@Composable
@StringRes
@ -735,8 +735,6 @@ class SettingsAdvancedScreen : SearchableSettings {
)
}
companion object {
private var job: Job? = null
}
// SY <--
}

2
app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsAppearanceScreen.kt
View File

@ -27,7 +27,7 @@ import uy.kohesive.injekt.Injekt
import uy.kohesive.injekt.api.get
import java.util.Date
class SettingsAppearanceScreen : SearchableSettings {
object SettingsAppearanceScreen : SearchableSettings {
@ReadOnlyComposable
@Composable

2
app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsBackupScreen.kt
View File

@ -59,7 +59,7 @@ import kotlinx.coroutines.launch
import uy.kohesive.injekt.Injekt
import uy.kohesive.injekt.api.get
class SettingsBackupScreen : SearchableSettings {
object SettingsBackupScreen : SearchableSettings {
@ReadOnlyComposable
@Composable

2
app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsBrowseScreen.kt
View File

@ -26,7 +26,7 @@ import eu.kanade.tachiyomi.util.system.AuthenticatorUtil.authenticate
import uy.kohesive.injekt.Injekt
import uy.kohesive.injekt.api.get
class SettingsBrowseScreen : SearchableSettings {
object SettingsBrowseScreen : SearchableSettings {
@ReadOnlyComposable
@Composable

2
app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsDownloadScreen.kt
View File

@ -32,7 +32,7 @@ import uy.kohesive.injekt.Injekt
import uy.kohesive.injekt.api.get
import java.io.File
class SettingsDownloadScreen : SearchableSettings {
object SettingsDownloadScreen : SearchableSettings {
@ReadOnlyComposable
@Composable

2
app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsEhScreen.kt
View File

@ -83,7 +83,7 @@ import kotlin.time.Duration.Companion.milliseconds
import kotlin.time.Duration.Companion.minutes
import kotlin.time.Duration.Companion.seconds
class SettingsEhScreen : SearchableSettings {
object SettingsEhScreen : SearchableSettings {
@ReadOnlyComposable
@Composable

2
app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsGeneralScreen.kt
View File

@ -27,7 +27,7 @@ import org.xmlpull.v1.XmlPullParser
import uy.kohesive.injekt.Injekt
import uy.kohesive.injekt.api.get
class SettingsGeneralScreen : SearchableSettings {
object SettingsGeneralScreen : SearchableSettings {
@Composable
@ReadOnlyComposable

2
app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsLibraryScreen.kt
View File

@ -64,7 +64,7 @@ import kotlinx.coroutines.runBlocking
import uy.kohesive.injekt.Injekt
import uy.kohesive.injekt.api.get
class SettingsLibraryScreen : SearchableSettings {
object SettingsLibraryScreen : SearchableSettings {
@Composable
@ReadOnlyComposable

36
app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsMainScreen.kt
View File

@ -181,90 +181,89 @@ object SettingsMainScreen : Screen {
private fun Navigator.navigate(screen: Screen, twoPane: Boolean) {
if (twoPane) replaceAll(screen) else push(screen)
}
}
private data class Item(
private data class Item(
@StringRes val titleRes: Int,
@StringRes val subtitleRes: Int,
val formatSubtitle: @Composable () -> String = { stringResource(subtitleRes) },
val icon: ImageVector,
val screen: Screen,
)
)
private val items = listOf(
private val items = listOf(
Item(
titleRes = R.string.pref_category_general,
subtitleRes = R.string.pref_general_summary,
icon = Icons.Outlined.Tune,
screen = SettingsGeneralScreen(),
screen = SettingsGeneralScreen,
),
Item(
titleRes = R.string.pref_category_appearance,
subtitleRes = R.string.pref_appearance_summary,
icon = Icons.Outlined.Palette,
screen = SettingsAppearanceScreen(),
screen = SettingsAppearanceScreen,
),
Item(
titleRes = R.string.pref_category_library,
subtitleRes = R.string.pref_library_summary,
icon = Icons.Outlined.CollectionsBookmark,
screen = SettingsLibraryScreen(),
screen = SettingsLibraryScreen,
),
Item(
titleRes = R.string.pref_category_reader,
subtitleRes = R.string.pref_reader_summary,
icon = Icons.Outlined.ChromeReaderMode,
screen = SettingsReaderScreen(),
screen = SettingsReaderScreen,
),
Item(
titleRes = R.string.pref_category_downloads,
subtitleRes = R.string.pref_downloads_summary,
icon = Icons.Outlined.GetApp,
screen = SettingsDownloadScreen(),
screen = SettingsDownloadScreen,
),
Item(
titleRes = R.string.pref_category_tracking,
subtitleRes = R.string.pref_tracking_summary,
icon = Icons.Outlined.Sync,
screen = SettingsTrackingScreen(),
screen = SettingsTrackingScreen,
),
Item(
titleRes = R.string.browse,
subtitleRes = R.string.pref_browse_summary,
icon = Icons.Outlined.Explore,
screen = SettingsBrowseScreen(),
screen = SettingsBrowseScreen,
),
Item(
titleRes = R.string.label_backup,
subtitleRes = R.string.pref_backup_summary,
icon = Icons.Outlined.SettingsBackupRestore,
screen = SettingsBackupScreen(),
screen = SettingsBackupScreen,
),
Item(
titleRes = R.string.pref_category_security,
subtitleRes = R.string.pref_security_summary,
icon = Icons.Outlined.Security,
screen = SettingsSecurityScreen(),
screen = SettingsSecurityScreen,
),
// SY -->
Item(
titleRes = R.string.pref_category_eh,
subtitleRes = R.string.pref_ehentai_summary,
icon = EhAssets.EhLogo,
screen = SettingsEhScreen(),
screen = SettingsEhScreen,
),
Item(
titleRes = R.string.pref_category_mangadex,
subtitleRes = R.string.pref_mangadex_summary,
icon = EhAssets.MangadexLogo,
screen = SettingsMangadexScreen(),
screen = SettingsMangadexScreen,
),
// SY <--
Item(
titleRes = R.string.pref_category_advanced,
subtitleRes = R.string.pref_advanced_summary,
icon = Icons.Outlined.Code,
screen = SettingsAdvancedScreen(),
screen = SettingsAdvancedScreen,
),
Item(
titleRes = R.string.pref_category_about,
@ -273,6 +272,7 @@ private val items = listOf(
"${stringResource(R.string.app_name)} ${AboutScreen.getVersionName(withBuildDate = false)}"
},
icon = Icons.Outlined.Info,
screen = AboutScreen(),
screen = AboutScreen,
),
)
)
}

2
app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsMangadexScreen.kt
View File

@ -58,7 +58,7 @@ import logcat.LogPriority
import uy.kohesive.injekt.Injekt
import uy.kohesive.injekt.api.get
class SettingsMangadexScreen : SearchableSettings {
object SettingsMangadexScreen : SearchableSettings {
@ReadOnlyComposable
@Composable

2
app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsReaderScreen.kt
View File

@ -23,7 +23,7 @@ import eu.kanade.tachiyomi.util.system.isReleaseBuildType
import uy.kohesive.injekt.Injekt
import uy.kohesive.injekt.api.get
class SettingsReaderScreen : SearchableSettings {
object SettingsReaderScreen : SearchableSettings {
@ReadOnlyComposable
@Composable

24
app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsSearchScreen.kt
View File

@ -285,20 +285,20 @@ private fun getLocalizedBreadcrumb(path: String, node: String?): String {
}
private val settingScreens = listOf(
SettingsGeneralScreen(),
SettingsAppearanceScreen(),
SettingsLibraryScreen(),
SettingsReaderScreen(),
SettingsDownloadScreen(),
SettingsTrackingScreen(),
SettingsBrowseScreen(),
SettingsBackupScreen(),
SettingsSecurityScreen(),
SettingsGeneralScreen,
SettingsAppearanceScreen,
SettingsLibraryScreen,
SettingsReaderScreen,
SettingsDownloadScreen,
SettingsTrackingScreen,
SettingsBrowseScreen,
SettingsBackupScreen,
SettingsSecurityScreen,
// SY -->
SettingsEhScreen(),
SettingsMangadexScreen(),
SettingsEhScreen,
SettingsMangadexScreen,
// SY <--
SettingsAdvancedScreen(),
SettingsAdvancedScreen,
)
private data class SettingsData(

2
app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsSecurityScreen.kt
View File

@ -40,7 +40,7 @@ import eu.kanade.tachiyomi.util.system.AuthenticatorUtil.isAuthenticationSupport
import uy.kohesive.injekt.Injekt
import uy.kohesive.injekt.api.get
class SettingsSecurityScreen : SearchableSettings {
object SettingsSecurityScreen : SearchableSettings {
@ReadOnlyComposable
@Composable

2
app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsTrackingScreen.kt
View File

@ -59,7 +59,7 @@ import eu.kanade.tachiyomi.util.system.toast
import uy.kohesive.injekt.Injekt
import uy.kohesive.injekt.api.get
class SettingsTrackingScreen : SearchableSettings {
object SettingsTrackingScreen : SearchableSettings {
@ReadOnlyComposable
@Composable

10
app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsMainController.kt
View File

@ -45,9 +45,9 @@ class SettingsMainController(bundle: Bundle = bundleOf()) : BasicFullComposeCont
if (!isTabletUi) {
Navigator(
screen = if (toBackupScreen) {
SettingsBackupScreen()
SettingsBackupScreen
} else if (toAboutScreen) {
AboutScreen()
AboutScreen
} else {
SettingsMainScreen
},
@ -63,11 +63,11 @@ class SettingsMainController(bundle: Bundle = bundleOf()) : BasicFullComposeCont
} else {
Navigator(
screen = if (toBackupScreen) {
SettingsBackupScreen()
SettingsBackupScreen
} else if (toAboutScreen) {
AboutScreen()
AboutScreen
} else {
SettingsGeneralScreen()
SettingsGeneralScreen
},
) {
TwoPanelBox(