diff --git a/android/app/src/main/res/drawable-hdpi/splash.png b/android/app/src/main/res/drawable-hdpi/splash.png index ecbf0f1..fc5daf6 100644 Binary files a/android/app/src/main/res/drawable-hdpi/splash.png and b/android/app/src/main/res/drawable-hdpi/splash.png differ diff --git a/android/app/src/main/res/drawable-mdpi/splash.png b/android/app/src/main/res/drawable-mdpi/splash.png index 4be99d3..8a97895 100644 Binary files a/android/app/src/main/res/drawable-mdpi/splash.png and b/android/app/src/main/res/drawable-mdpi/splash.png differ diff --git a/android/app/src/main/res/drawable-xhdpi/splash.png b/android/app/src/main/res/drawable-xhdpi/splash.png index 3902024..8a80cf4 100644 Binary files a/android/app/src/main/res/drawable-xhdpi/splash.png and b/android/app/src/main/res/drawable-xhdpi/splash.png differ diff --git a/android/app/src/main/res/drawable-xxhdpi/splash.png b/android/app/src/main/res/drawable-xxhdpi/splash.png index 378ddc2..184d61c 100644 Binary files a/android/app/src/main/res/drawable-xxhdpi/splash.png and b/android/app/src/main/res/drawable-xxhdpi/splash.png differ diff --git a/android/app/src/main/res/drawable-xxxhdpi/splash.png b/android/app/src/main/res/drawable-xxxhdpi/splash.png index 35384d6..32af11c 100644 Binary files a/android/app/src/main/res/drawable-xxxhdpi/splash.png and b/android/app/src/main/res/drawable-xxxhdpi/splash.png differ diff --git a/assets/icons/icon.png b/assets/icons/icon.png index 19b080a..e73972e 100644 Binary files a/assets/icons/icon.png and b/assets/icons/icon.png differ diff --git a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png b/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png index 4be99d3..8a97895 100644 Binary files a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png and b/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png differ diff --git a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png b/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png index 3902024..8a80cf4 100644 Binary files a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png and b/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png differ diff --git a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png b/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png index 378ddc2..184d61c 100644 Binary files a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png and b/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png differ diff --git a/lib/features/auth/views/connection_issue_page.dart b/lib/features/auth/views/connection_issue_page.dart index ecbbd3e..dd1d9da 100644 --- a/lib/features/auth/views/connection_issue_page.dart +++ b/lib/features/auth/views/connection_issue_page.dart @@ -24,7 +24,6 @@ class ConnectionIssuePage extends ConsumerStatefulWidget { } class _ConnectionIssuePageState extends ConsumerState { - bool _isRetrying = false; bool _isLoggingOut = false; String? _statusMessage; @@ -48,16 +47,6 @@ class _ConnectionIssuePageState extends ConsumerState { child: Column( crossAxisAlignment: CrossAxisAlignment.stretch, children: [ - Align( - alignment: Alignment.centerLeft, - child: ConduitIconButton( - icon: Platform.isIOS - ? CupertinoIcons.gear_alt_fill - : Icons.settings_ethernet, - onPressed: () => context.go(Routes.serverConnection), - tooltip: l10n.backToServerSetup, - ), - ), Expanded( child: Center( child: ConstrainedBox( @@ -186,8 +175,9 @@ class _ConnectionIssuePageState extends ConsumerState { children: [ ConduitButton( text: l10n.retry, - onPressed: _isRetrying || _isLoggingOut ? null : () => _retry(l10n), - isLoading: _isRetrying, + onPressed: _isLoggingOut + ? null + : () => context.go(Routes.serverConnection), icon: Platform.isIOS ? CupertinoIcons.refresh : Icons.refresh_rounded, @@ -196,9 +186,7 @@ class _ConnectionIssuePageState extends ConsumerState { const SizedBox(height: Spacing.sm), ConduitButton( text: l10n.signOut, - onPressed: _isRetrying || _isLoggingOut - ? null - : () => _logout(l10n), + onPressed: _isLoggingOut ? null : () => _logout(l10n), isLoading: _isLoggingOut, isSecondary: true, icon: Platform.isIOS @@ -225,39 +213,6 @@ class _ConnectionIssuePageState extends ConsumerState { ); } - Future _retry(AppLocalizations l10n) async { - setState(() { - _isRetrying = true; - _statusMessage = null; - }); - - try { - final service = ref.read(connectivityServiceProvider); - final isOnline = await service.checkConnectivity(); - - if (!mounted) return; - - if (isOnline) { - await ref.read(authActionsProvider).refresh(); - } else { - setState(() { - _statusMessage = l10n.stillOfflineMessage; - }); - } - } catch (_) { - if (!mounted) return; - setState(() { - _statusMessage = l10n.couldNotConnectGeneric; - }); - } finally { - if (mounted) { - setState(() { - _isRetrying = false; - }); - } - } - } - Future _logout(AppLocalizations l10n) async { setState(() { _isLoggingOut = true; diff --git a/lib/features/navigation/widgets/chats_drawer.dart b/lib/features/navigation/widgets/chats_drawer.dart index f628d1e..78c95d7 100644 --- a/lib/features/navigation/widgets/chats_drawer.dart +++ b/lib/features/navigation/widgets/chats_drawer.dart @@ -708,11 +708,11 @@ class _ChatsDrawerState extends ConsumerState { return Material( color: isHover ? hoverColor : baseColor, shape: RoundedRectangleBorder( - borderRadius: BorderRadius.zero, + borderRadius: BorderRadius.circular(AppBorderRadius.small), side: BorderSide(color: borderColor, width: BorderWidth.thin), ), child: InkWell( - borderRadius: BorderRadius.zero, + borderRadius: BorderRadius.circular(AppBorderRadius.small), onTap: () { final current = {...ref.read(_expandedFoldersProvider)}; final next = !isExpanded; @@ -1171,7 +1171,7 @@ class _ChatsDrawerState extends ConsumerState { ? theme.navigationSelectedBackground : theme.surfaceContainer, shape: RoundedRectangleBorder( - borderRadius: BorderRadius.zero, + borderRadius: BorderRadius.circular(AppBorderRadius.small), side: BorderSide( color: show ? theme.navigationSelected @@ -1180,7 +1180,7 @@ class _ChatsDrawerState extends ConsumerState { ), ), child: InkWell( - borderRadius: BorderRadius.zero, + borderRadius: BorderRadius.circular(AppBorderRadius.small), onTap: () => ref.read(_showArchivedProvider.notifier).set(!show), overlayColor: WidgetStateProperty.resolveWith((states) { if (states.contains(WidgetState.pressed)) { @@ -1452,7 +1452,7 @@ class _ConversationDragFeedback extends StatelessWidget { @override Widget build(BuildContext context) { - final borderRadius = BorderRadius.zero; + final borderRadius = BorderRadius.circular(AppBorderRadius.small); final borderColor = theme.surfaceContainerHighest.withValues(alpha: 0.40); return Material( @@ -1614,7 +1614,7 @@ class _ConversationTile extends StatelessWidget { @override Widget build(BuildContext context) { final theme = context.conduitTheme; - final borderRadius = BorderRadius.zero; + final borderRadius = BorderRadius.circular(AppBorderRadius.small); final Color background = selected ? theme.buttonPrimary.withValues(alpha: 0.1) : theme.surfaceContainer;