Solar/App
2
2
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

✨ Finish up connections

Browse Source
This commit is contained in:
LittleSheep
2025-06-17 23:49:46 +08:00
parent 9b67d58ee4
commit eb4d2c2e2f
4 changed files with 195 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
lib/screens/account/me/settings.dart
View File

@ -156,22 +156,8 @@ class AccountSettingsScreen extends HookConsumerWidget {
getLocalizedProviderName(connection.provider),
).tr(),
subtitle:
connection.meta.isNotEmpty
? Column(
crossAxisAlignment:
CrossAxisAlignment.stretch,
mainAxisSize: MainAxisSize.min,
children: [
for (final meta
in connection.meta.entries)
Text(
'${meta.key.split('_').map((word) => word[0].toUpperCase() + word.substring(1)).join(' ')}: ${meta.value}',
style: const TextStyle(
fontSize: 12,
),
),
],
)
connection.meta['email'] != null
? Text(connection.meta['email'])
: Text(connection.providedIdentifier),
leading: CircleAvatar(
child: getProviderIcon(
@ -184,7 +170,6 @@ class AccountSettingsScreen extends HookConsumerWidget {
),
).padding(top: 4),
trailing: const Icon(Symbols.chevron_right),
isThreeLine: true,
onTap: () {
showModalBottomSheet(
context: context,

22
lib/screens/account/me/settings_connections.dart
View File

@ -8,6 +8,7 @@ import 'package:island/models/auth.dart';
import 'package:island/pods/network.dart';
import 'package:island/screens/account/me/settings.dart';
import 'package:island/screens/auth/oidc.native.dart';
import 'package:island/services/text.dart';
import 'package:island/services/time.dart';
import 'package:island/widgets/alert.dart';
import 'package:island/widgets/content/sheet.dart';
@ -96,6 +97,18 @@ class AccountConnectionSheet extends HookConsumerWidget {
const Gap(8),
Text(getLocalizedProviderName(connection.provider)).tr(),
const Gap(4),
if (connection.meta.isNotEmpty)
Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
mainAxisSize: MainAxisSize.min,
children: [
for (final meta in connection.meta.entries)
Text(
'${meta.key.replaceAll('_', ' ').capitalizeEachWord()}: ${meta.value}',
style: const TextStyle(fontSize: 12),
),
],
),
Text(
connection.providedIdentifier,
style: Theme.of(context).textTheme.bodySmall,
@ -174,10 +187,12 @@ class AccountConnectionNewSheet extends HookConsumerWidget {
builder:
(context) => OidcScreen(
provider: selectedProvider.value.toLowerCase(),
title: 'Connect with ${selectedProvider.value}',
title:
'Connect with ${selectedProvider.value.capitalizeEachWord()}',
),
),
);
if (context.mounted) Navigator.pop(context, true);
break;
default:
showSnackBar(context, 'accountConnectionAddError'.tr());
@ -326,7 +341,10 @@ class AccountConnectionsSheet extends HookConsumerWidget {
connection.provider,
),
).tr(),
subtitle: Text(connection.providedIdentifier),
subtitle:
connection.meta['email'] != null
? Text(connection.meta['email'])
: Text(connection.providedIdentifier),
trailing: Text(
DateFormat.yMd().format(
connection.lastUsedAt.toLocal(),