Clean up UpdatesController

- Move loading state into scaffold (closes #7704)
- Move logic into presenter
- Make some composables private
This commit is contained in:
arkon
2022-09-18 22:38:44 -04:00
parent f85cbb1582
commit 0e3176a77c
14 changed files with 159 additions and 155 deletions

View File

@@ -406,7 +406,7 @@ private fun SourceSwitchPreference(
}
@Composable
fun NsfwWarningDialog(
private fun NsfwWarningDialog(
onClickConfirm: () -> Unit,
) {
AlertDialog(

View File

@@ -61,7 +61,7 @@ fun ExtensionFilterScreen(
}
@Composable
fun SourceFilterContent(
private fun SourceFilterContent(
contentPadding: PaddingValues,
state: ExtensionFilterState,
onClickLang: (String) -> Unit,
@@ -83,7 +83,7 @@ fun SourceFilterContent(
}
@Composable
fun ExtensionFilterItem(
private fun ExtensionFilterItem(
modifier: Modifier,
lang: String,
enabled: Boolean,

View File

@@ -91,7 +91,7 @@ fun ExtensionScreen(
}
@Composable
fun ExtensionContent(
private fun ExtensionContent(
state: ExtensionsState,
onLongClickItem: (Extension) -> Unit,
onClickItemCancel: (Extension) -> Unit,
@@ -201,7 +201,7 @@ fun ExtensionContent(
}
@Composable
fun ExtensionItem(
private fun ExtensionItem(
modifier: Modifier = Modifier,
item: ExtensionUiModel.Item,
onClickItem: (Extension) -> Unit,
@@ -238,7 +238,7 @@ fun ExtensionItem(
}
@Composable
fun ExtensionItemContent(
private fun ExtensionItemContent(
extension: Extension,
modifier: Modifier = Modifier,
) {
@@ -294,7 +294,7 @@ fun ExtensionItemContent(
}
@Composable
fun ExtensionItemActions(
private fun ExtensionItemActions(
extension: Extension,
installStep: InstallStep,
modifier: Modifier = Modifier,
@@ -348,7 +348,7 @@ fun ExtensionItemActions(
}
@Composable
fun ExtensionHeader(
private fun ExtensionHeader(
@StringRes textRes: Int,
modifier: Modifier = Modifier,
action: @Composable RowScope.() -> Unit = {},
@@ -361,7 +361,7 @@ fun ExtensionHeader(
}
@Composable
fun ExtensionHeader(
private fun ExtensionHeader(
text: String,
modifier: Modifier = Modifier,
action: @Composable RowScope.() -> Unit = {},
@@ -382,7 +382,7 @@ fun ExtensionHeader(
}
@Composable
fun ExtensionTrustDialog(
private fun ExtensionTrustDialog(
onClickConfirm: () -> Unit,
onClickDismiss: () -> Unit,
onDismissRequest: () -> Unit,

View File

@@ -62,7 +62,7 @@ fun MigrateMangaScreen(
}
@Composable
fun MigrateMangaContent(
private fun MigrateMangaContent(
contentPadding: PaddingValues,
state: MigrateMangaState,
onClickItem: (Manga) -> Unit,
@@ -82,7 +82,7 @@ fun MigrateMangaContent(
}
@Composable
fun MigrateMangaItem(
private fun MigrateMangaItem(
modifier: Modifier = Modifier,
manga: Manga,
onClickItem: (Manga) -> Unit,

View File

@@ -70,7 +70,7 @@ fun MigrateSourceScreen(
}
@Composable
fun MigrateSourceList(
private fun MigrateSourceList(
list: List<Pair<Source, Long>>,
onClickItem: (Source) -> Unit,
onLongClickItem: (Source) -> Unit,
@@ -126,7 +126,7 @@ fun MigrateSourceList(
}
@Composable
fun MigrateSourceItem(
private fun MigrateSourceItem(
modifier: Modifier = Modifier,
source: Source,
count: Long,

View File

@@ -66,7 +66,7 @@ fun SourcesFilterScreen(
}
@Composable
fun SourcesFilterContent(
private fun SourcesFilterContent(
contentPadding: PaddingValues,
state: SourcesFilterState,
onClickLang: (String) -> Unit,
@@ -111,7 +111,7 @@ fun SourcesFilterContent(
}
@Composable
fun SourcesFilterHeader(
private fun SourcesFilterHeader(
modifier: Modifier,
language: String,
enabled: Boolean,
@@ -128,7 +128,7 @@ fun SourcesFilterHeader(
}
@Composable
fun SourcesFilterItem(
private fun SourcesFilterItem(
modifier: Modifier,
source: Source,
enabled: Boolean,

View File

@@ -75,7 +75,7 @@ fun SourcesScreen(
}
@Composable
fun SourceList(
private fun SourceList(
state: SourcesState,
onClickItem: (Source, String) -> Unit,
onClickDisable: (Source) -> Unit,
@@ -135,7 +135,7 @@ fun SourceList(
}
@Composable
fun SourceHeader(
private fun SourceHeader(
modifier: Modifier = Modifier,
language: String,
) {
@@ -149,7 +149,7 @@ fun SourceHeader(
}
@Composable
fun SourceItem(
private fun SourceItem(
modifier: Modifier = Modifier,
source: Source,
onClickItem: (Source, String) -> Unit,
@@ -181,7 +181,7 @@ fun SourceItem(
}
@Composable
fun SourcePinButton(
private fun SourcePinButton(
isPinned: Boolean,
onClick: () -> Unit,
) {
@@ -197,7 +197,7 @@ fun SourcePinButton(
}
@Composable
fun SourceOptionsDialog(
private fun SourceOptionsDialog(
source: Source,
onClickPin: () -> Unit,
onClickDisable: () -> Unit,