mobile/davx5-ose
mobile/davx5-ose
1
0
Fork 0
mirror of https://github.com/bitfireAT/davx5-ose synced 2024-07-22 03:01:24 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Backport changes from build variants

Browse source
This commit is contained in:
Ricki Hirner 2024-03-24 18:25:30 +01:00
parent 079c3efdfd
commit b63cd67e9c
10 changed files with 31 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/src/main/kotlin/at/bitfire/davdroid/settings/SettingsManager.kt
View file

@ -104,6 +104,7 @@ class SettingsManager internal constructor(
/*** SETTINGS ACCESS ***/
fun containsKey(key: String) = providers.any { it.contains(key) }
fun containsKeyLive(key: String) = SettingLiveData { containsKey(key) }
private fun<T> getValue(key: String, reader: (SettingsProvider) -> T?): T? {
Logger.log.fine("Looking up setting $key")

8
app/src/main/kotlin/at/bitfire/davdroid/ui/setup/LoginScreen.kt
View file

@ -99,9 +99,12 @@ fun LoginScreen(
loginTypesProvider.LoginTypePage(
selectedLoginType = selectedLoginType,
onSelectLoginType = { selectedLoginType = it },
loginInfo = loginInfo,
onUpdateLoginInfo = { loginInfo = it },
onContinue = {
phase = LoginActivity.Phase.LOGIN_DETAILS
}
},
onFinish = onFinish
)
LoginActivity.Phase.LOGIN_DETAILS -> {
@ -115,7 +118,8 @@ fun LoginScreen(
onUpdateLoginInfo = { loginInfo = it },
onDetectResources = {
phase = LoginActivity.Phase.DETECT_RESOURCES
}
},
onFinish = onFinish
)
}

1
app/src/main/kotlin/at/bitfire/davdroid/ui/setup/LoginType.kt
View file

@ -17,6 +17,7 @@ interface LoginType {
loginInfo: LoginInfo,
onUpdateLoginInfo: (newLoginInfo: LoginInfo) -> Unit,
onDetectResources: () -> Unit,
onFinish: () -> Unit
)
}

3
app/src/main/kotlin/at/bitfire/davdroid/ui/setup/LoginTypeAdvanced.kt
View file

@ -63,7 +63,8 @@ object LoginTypeAdvanced : LoginType {
snackbarHostState: SnackbarHostState,
loginInfo: LoginInfo,
onUpdateLoginInfo: (newLoginInfo: LoginInfo) -> Unit,
onDetectResources: () -> Unit
onDetectResources: () -> Unit,
onFinish: () -> Unit
) {
LoginTypeAdvanced_Content(
snackbarHostState = snackbarHostState,

3
app/src/main/kotlin/at/bitfire/davdroid/ui/setup/LoginTypeEmail.kt
View file

@ -53,7 +53,8 @@ object LoginTypeEmail : LoginType {
snackbarHostState: SnackbarHostState,
loginInfo: LoginInfo,
onUpdateLoginInfo: (newLoginInfo: LoginInfo) -> Unit,
onDetectResources: () -> Unit
onDetectResources: () -> Unit,
onFinish: () -> Unit
) {
LoginTypeEmail_Content(
loginInfo = loginInfo,

1
app/src/main/kotlin/at/bitfire/davdroid/ui/setup/LoginTypeGoogle.kt
View file

@ -144,6 +144,7 @@ object LoginTypeGoogle : LoginType {
loginInfo: LoginInfo,
onUpdateLoginInfo: (newLoginInfo: LoginInfo) -> Unit,
onDetectResources: () -> Unit,
onFinish: () -> Unit
) {
val context = LocalContext.current
val scope = rememberCoroutineScope()

6
app/src/main/kotlin/at/bitfire/davdroid/ui/setup/LoginTypeNextcloud.kt
View file

@ -106,7 +106,8 @@ object LoginTypeNextcloud : LoginType {
snackbarHostState: SnackbarHostState,
loginInfo: LoginInfo,
onUpdateLoginInfo: (newLoginInfo: LoginInfo) -> Unit,
onDetectResources: () -> Unit
onDetectResources: () -> Unit,
onFinish: () -> Unit
) {
val context = LocalContext.current
val locale = Locale.current
@ -393,7 +394,8 @@ fun NextcloudLoginScreen(
singleLine = true
)
LaunchedEffect(Unit) {
focusRequester.requestFocus()
if (loginInfo.baseUri == null)
focusRequester.requestFocus()
}
if (error != null)

3
app/src/main/kotlin/at/bitfire/davdroid/ui/setup/LoginTypeUrl.kt
View file

@ -52,7 +52,8 @@ object LoginTypeUrl : LoginType {
snackbarHostState: SnackbarHostState,
loginInfo: LoginInfo,
onUpdateLoginInfo: (newLoginInfo: LoginInfo) -> Unit,
onDetectResources: () -> Unit
onDetectResources: () -> Unit,
onFinish: () -> Unit
) {
LoginTypeUrl_Content(
loginInfo = loginInfo,

5
app/src/main/kotlin/at/bitfire/davdroid/ui/setup/LoginTypesProvider.kt
View file

@ -13,7 +13,10 @@ interface LoginTypesProvider {
fun LoginTypePage(
selectedLoginType: LoginType,
onSelectLoginType: (LoginType) -> Unit,
onContinue: () -> Unit
loginInfo: LoginInfo,
onUpdateLoginInfo: (newLoginInfo: LoginInfo) -> Unit,
onContinue: () -> Unit,
onFinish: () -> Unit
)
}

9
app/src/ose/kotlin/at/bitfire/davdroid/ui/setup/StandardLoginTypesProvider.kt
View file

@ -28,7 +28,14 @@ class StandardLoginTypesProvider @Inject constructor() : LoginTypesProvider {
LoginTypeUrl
@Composable
override fun LoginTypePage(selectedLoginType: LoginType, onSelectLoginType: (LoginType) -> Unit, onContinue: () -> Unit) {
override fun LoginTypePage(
selectedLoginType: LoginType,
onSelectLoginType: (LoginType) -> Unit,
loginInfo: LoginInfo,
onUpdateLoginInfo: (newLoginInfo: LoginInfo) -> Unit,
onContinue: () -> Unit,
onFinish: () -> Unit
) {
StandardLoginTypePage(
selectedLoginType = selectedLoginType,
onSelectLoginType = onSelectLoginType,