mirror/davx5-ose
1
0
Fork 0
mirror of https://github.com/bitfireAT/davx5-ose.git synced 2025-12-23 23:17:50 -05:00
Code Issues Packages Projects Releases Wiki Activity

[Google] Remove warning box on login screen (#1548)

Browse Source 
* Remove the google login warning card

Signed-off-by: Sunik Kupfer <kupfer@bitfire.at>

* Remove unused uri handler variable

Signed-off-by: Sunik Kupfer <kupfer@bitfire.at>

---------

Signed-off-by: Sunik Kupfer <kupfer@bitfire.at>
This commit is contained in:
Sunik Kupfer
2025-06-26 12:47:53 +02:00
committed by GitHub
parent a7f8ea8a48
commit 90b04ddbdc
2 changed files with 0 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
app/src/main/kotlin/at/bitfire/davdroid/ui/setup/GoogleLogin.kt
View File

@@ -9,7 +9,6 @@ import android.net.Uri
import androidx.activity.compose.rememberLauncherForActivityResult
import androidx.compose.foundation.Image
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
@@ -22,8 +21,6 @@ import androidx.compose.foundation.verticalScroll
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.Email
import androidx.compose.material3.Button
import androidx.compose.material3.ButtonDefaults
import androidx.compose.material3.Card
import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.OutlinedTextField
@@ -36,7 +33,6 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.focus.FocusRequester
import androidx.compose.ui.focus.focusRequester
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.platform.LocalUriHandler
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.input.ImeAction
@@ -50,7 +46,6 @@ import at.bitfire.davdroid.Constants.withStatParams
import at.bitfire.davdroid.R
import at.bitfire.davdroid.ui.UiUtils.toAnnotatedString
import at.bitfire.davdroid.ui.setup.GoogleLogin.GOOGLE_POLICY_URL
import at.bitfire.davdroid.ui.setup.GoogleLogin.helpUrl
import java.util.logging.Level
import java.util.logging.Logger
@@ -137,7 +132,6 @@ fun GoogleLoginScreen(
onLogin: () -> Unit = {}
) {
val context = LocalContext.current
val uriHandler = LocalUriHandler.current
Column(
Modifier
@@ -150,31 +144,6 @@ fun GoogleLoginScreen(
modifier = Modifier.padding(vertical = 8.dp)
)
Card(Modifier.fillMaxWidth()) {
Column(Modifier.padding(8.dp)) {
Row {
Text(
stringResource(R.string.login_google_see_tested_with),
style = MaterialTheme.typography.bodyMedium,
)
}
Text(
stringResource(R.string.login_google_unexpected_warnings),
style = MaterialTheme.typography.bodyMedium,
modifier = Modifier.padding(vertical = 8.dp)
)
Button(
onClick = {
uriHandler.openUri(helpUrl.toString())
},
colors = ButtonDefaults.outlinedButtonColors(),
modifier = Modifier.wrapContentSize()
) {
Text(stringResource(R.string.intro_more_info))
}
}
}
val focusRequester = remember { FocusRequester() }
OutlinedTextField(
email,

2
app/src/main/res/values/strings.xml
View File

@@ -307,8 +307,6 @@
<string name="login_fastmail_account">Fastmail account</string>
<string name="login_fastmail_sign_in">Sign in with Fastmail</string>
<string name="login_type_google">Google Contacts / Calendar</string>
<string name="login_google_see_tested_with">Please see our \"Tested with Google\" page for up-to-date information.</string>
<string name="login_google_unexpected_warnings">You may experience unexpected warnings and/or have to create your own client ID.</string>
<string name="login_google_account">Google account</string>
<string name="login_google">Sign in with Google</string>
<string name="login_google_client_id">Client ID (optional)</string>