Skip to content

Update Flutter SDK version to 3.41.6 #35

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Devasy wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Update Flutter SDK version to 3.41.6 #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
110 changes: 60 additions & 50 deletions workout-logger/lib/screens/profile_screen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,16 +43,18 @@ class _ProfileScreenState extends State<ProfileScreen> {
final file = File('${tempDir.path}/repforge_backup_$dateStr.json');
await file.writeAsString(jsonString);

final result = await Share.shareXFiles([XFile(file.path)],
subject: 'RepForge Backup');
final result = await Share.shareXFiles([
XFile(file.path),
], subject: 'RepForge Backup');

if (!mounted) return;
if (result.status == ShareResultStatus.success ||
result.status == ShareResultStatus.dismissed) {
_showSnack('Backup exported successfully!', AppTheme.success);
}
} catch (e) {
if (mounted) _showSnack('Export failed. Please try again.', AppTheme.error);
if (mounted)
_showSnack('Export failed. Please try again.', AppTheme.error);
} finally {
if (mounted) setState(() => _isExporting = false);
}
Expand All @@ -64,8 +66,10 @@ class _ProfileScreenState extends State<ProfileScreen> {
builder: (ctx) => AlertDialog(
backgroundColor: AppTheme.cardColor,
shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(16)),
title: const Text('Import Backup',
style: TextStyle(color: AppTheme.textPrimary)),
title: const Text(
'Import Backup',
style: TextStyle(color: AppTheme.textPrimary),
),
content: const Text(
'This will merge the backup with your existing data. '
'Select a .json RepForge backup file to continue.',
Expand All @@ -74,13 +78,17 @@ class _ProfileScreenState extends State<ProfileScreen> {
actions: [
TextButton(
onPressed: () => Navigator.pop(ctx, false),
child:
const Text('Cancel', style: TextStyle(color: AppTheme.textSecondary)),
child: const Text(
'Cancel',
style: TextStyle(color: AppTheme.textSecondary),
),
),
ElevatedButton(
style: ElevatedButton.styleFrom(
backgroundColor: AppTheme.primaryColor,
shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(8)),
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(8),
),
),
onPressed: () => Navigator.pop(ctx, true),
child: const Text('Choose File'),
Expand All @@ -92,8 +100,10 @@ class _ProfileScreenState extends State<ProfileScreen> {

setState(() => _isImporting = true);
try {
final result = await FilePicker.platform
.pickFiles(type: FileType.custom, allowedExtensions: ['json']);
final result = await FilePicker.platform.pickFiles(
type: FileType.custom,
allowedExtensions: ['json'],
);
if (result == null || result.files.single.path == null) {
if (mounted) setState(() => _isImporting = false);
return;
Expand All @@ -114,10 +124,12 @@ class _ProfileScreenState extends State<ProfileScreen> {
final sessionCount = (data['sessions'] as List?)?.length ?? 0;
final routineCount = (data['routines'] as List?)?.length ?? 0;
_showSnack(
'Import complete! $sessionCount sessions, $routineCount routines.',
AppTheme.success);
'Import complete! $sessionCount sessions, $routineCount routines.',
AppTheme.success,
);
} catch (e) {
if (mounted) _showSnack('Import failed. Invalid backup file.', AppTheme.error);
if (mounted)
_showSnack('Import failed. Invalid backup file.', AppTheme.error);
} finally {
if (mounted) setState(() => _isImporting = false);
}
Expand All @@ -136,7 +148,9 @@ class _ProfileScreenState extends State<ProfileScreen> {

if (!mounted) return;
_showSnack(
success ? 'Cloud backup successful!' : 'Backup failed. Please try again.',
success
? 'Cloud backup successful!'
: 'Backup failed. Please try again.',
success ? AppTheme.success : AppTheme.error,
);
} catch (_) {
Expand All @@ -147,9 +161,9 @@ class _ProfileScreenState extends State<ProfileScreen> {
}

void _showSnack(String message, Color color) {
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(content: Text(message), backgroundColor: color),
);
ScaffoldMessenger.of(
context,
).showSnackBar(SnackBar(content: Text(message), backgroundColor: color));
}

// ==================== Build ====================
Expand Down Expand Up @@ -199,7 +213,10 @@ class _ProfileScreenState extends State<ProfileScreen> {
),
child: SafeArea(
child: Padding(
padding: const EdgeInsets.all(AppSpacing.lg),
padding: const EdgeInsets.symmetric(
horizontal: AppSpacing.lg,
vertical: AppSpacing.md,
),
child: Column(
mainAxisAlignment: MainAxisAlignment.end,
crossAxisAlignment: CrossAxisAlignment.start,
Expand Down Expand Up @@ -295,17 +312,16 @@ class _ProfileScreenState extends State<ProfileScreen> {
selectedColor: AppTheme.primaryColor.withOpacity(0.25),
backgroundColor: AppTheme.surfaceColor,
labelStyle: TextStyle(
color:
selected ? AppTheme.primaryColor : AppTheme.textSecondary,
fontWeight:
selected ? FontWeight.bold : FontWeight.normal,
color: selected
? AppTheme.primaryColor
: AppTheme.textSecondary,
fontWeight: selected ? FontWeight.bold : FontWeight.normal,
fontSize: 13,
),
side: BorderSide(
color: selected ? AppTheme.primaryColor : Colors.transparent,
),
padding:
const EdgeInsets.symmetric(horizontal: 4, vertical: 2),
padding: const EdgeInsets.symmetric(horizontal: 4, vertical: 2),
);
}).toList(),
),
Expand Down Expand Up @@ -374,17 +390,24 @@ class _ProfileScreenState extends State<ProfileScreen> {
decoration: InputDecoration(
hintText: 'mongodb+srv://user:pass@cluster.mongodb.net/db',
hintStyle: const TextStyle(
color: AppTheme.textMuted, fontSize: 13),
prefixIcon: const Icon(Icons.link_rounded,
color: AppTheme.textMuted, size: 20),
color: AppTheme.textMuted,
fontSize: 13,
),
prefixIcon: const Icon(
Icons.link_rounded,
color: AppTheme.textMuted,
size: 20,
),
filled: true,
fillColor: AppTheme.surfaceColor.withOpacity(0.5),
border: OutlineInputBorder(
borderRadius: BorderRadius.circular(AppRadius.sm),
borderSide: BorderSide.none,
),
contentPadding: const EdgeInsets.symmetric(
horizontal: 12, vertical: 12),
horizontal: 12,
vertical: 12,
),
),
),
const SizedBox(height: AppSpacing.sm),
Expand Down Expand Up @@ -568,10 +591,8 @@ class _UnitToggleButton extends StatelessWidget {
child: Text(
label,
style: TextStyle(
color:
selected ? AppTheme.primaryColor : AppTheme.textSecondary,
fontWeight:
selected ? FontWeight.bold : FontWeight.normal,
color: selected ? AppTheme.primaryColor : AppTheme.textSecondary,
fontWeight: selected ? FontWeight.bold : FontWeight.normal,
fontSize: 15,
),
),
Expand Down Expand Up @@ -624,14 +645,12 @@ class _ActionTile extends StatelessWidget {
height: 20,
child: CircularProgressIndicator(
strokeWidth: 2,
valueColor:
AlwaysStoppedAnimation<Color>(AppTheme.primaryColor),
valueColor: AlwaysStoppedAnimation<Color>(
AppTheme.primaryColor,
),
),
)
: const Icon(
Icons.chevron_right,
color: AppTheme.textMuted,
),
: const Icon(Icons.chevron_right, color: AppTheme.textMuted),
onTap: onTap,
);
}
Expand All @@ -658,10 +677,7 @@ class _InfoTile extends StatelessWidget {
const SizedBox(width: 12),
Text(
label,
style: const TextStyle(
color: AppTheme.textSecondary,
fontSize: 13,
),
style: const TextStyle(color: AppTheme.textSecondary, fontSize: 13),
),
const Spacer(),
Text(
Expand All @@ -683,11 +699,7 @@ class _Divider extends StatelessWidget {

@override
Widget build(BuildContext context) {
return const Divider(
color: AppTheme.surfaceColor,
height: 1,
indent: 40,
);
return const Divider(color: AppTheme.surfaceColor, height: 1, indent: 40);
}
}

Expand All @@ -699,9 +711,7 @@ class _ComingSoonBadge extends StatelessWidget {
decoration: BoxDecoration(
color: AppTheme.warning.withOpacity(0.15),
borderRadius: BorderRadius.circular(AppRadius.full),
border: Border.all(
color: AppTheme.warning.withOpacity(0.4),
),
border: Border.all(color: AppTheme.warning.withOpacity(0.4)),
),
child: const Text(
'Coming Soon',
Expand Down
2 changes: 1 addition & 1 deletion workout-logger/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ version: 1.0.14+15

environment:
sdk: ^3.9.2
flutter: 3.41.5
flutter: 3.41.6

# Dependencies specify other packages that your package needs in order to work.
# To automatically upgrade your package dependencies to the latest versions
Expand Down