SelfPrivacy
/
selfprivacy.org.app
10
7
Fork 5
Code Issues 75 Pull Requests 2 Projects 1 Releases 24 Wiki Activity

refactor: Fix linter warnings 

- Remove unused text_extensions.dart
pull/384/head
NaiJi ✨ 2023-11-06 17:15:38 +04:00
parent dd9722646e
commit c894456fe6
31 changed files with 106 additions and 155 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/logic/api_maps/rest_maps/backblaze.dart
View File

@ -137,7 +137,7 @@ class BackblazeApi extends RestApiMap {
{ {
'daysFromHidingToDeleting': 30, 'daysFromHidingToDeleting': 30,
'daysFromUploadingToHiding': null, 'daysFromUploadingToHiding': null,
'fileNamePrefix': '' 'fileNamePrefix': '',
} }
], ],
}, },

1
lib/logic/api_maps/rest_maps/server_providers/digital_ocean/digital_ocean_api.dart
View File

@ -5,7 +5,6 @@ import 'package:selfprivacy/config/get_it_config.dart';
import 'package:selfprivacy/logic/api_maps/generic_result.dart'; import 'package:selfprivacy/logic/api_maps/generic_result.dart';
import 'package:selfprivacy/logic/api_maps/rest_maps/rest_api_map.dart'; import 'package:selfprivacy/logic/api_maps/rest_maps/rest_api_map.dart';
import 'package:selfprivacy/logic/api_maps/tls_options.dart'; import 'package:selfprivacy/logic/api_maps/tls_options.dart';
import 'package:selfprivacy/logic/models/disk_size.dart';
import 'package:selfprivacy/logic/models/hive/user.dart'; import 'package:selfprivacy/logic/models/hive/user.dart';
import 'package:selfprivacy/logic/models/json/digital_ocean_server_info.dart'; import 'package:selfprivacy/logic/models/json/digital_ocean_server_info.dart';
import 'package:selfprivacy/utils/password_generator.dart'; import 'package:selfprivacy/utils/password_generator.dart';

4
lib/logic/api_maps/rest_maps/server_providers/hetzner/hetzner_api.dart
View File

@ -409,7 +409,7 @@ class HetznerApi extends RestApiMap {
'labels': {'labelkey': 'value'}, 'labels': {'labelkey': 'value'},
'location': region, 'location': region,
'automount': false, 'automount': false,
'format': 'ext4' 'format': 'ext4',
}, },
); );
volume = HetznerVolume.fromJson(createVolumeResponse.data['volume']); volume = HetznerVolume.fromJson(createVolumeResponse.data['volume']);
@ -586,7 +586,7 @@ class HetznerApi extends RestApiMap {
final Map<String, dynamic> queryParameters = { final Map<String, dynamic> queryParameters = {
'start': start.toUtc().toIso8601String(), 'start': start.toUtc().toIso8601String(),
'end': end.toUtc().toIso8601String(), 'end': end.toUtc().toIso8601String(),
'type': type 'type': type,
}; };
final Response res = await client.get( final Response res = await client.get(
'/servers/$serverId/metrics', '/servers/$serverId/metrics',

4
lib/logic/cubit/server_installation/server_installation_state.dart
View File

@ -26,7 +26,7 @@ abstract class ServerInstallationState extends Equatable {
serverDetails, serverDetails,
isServerStarted, isServerStarted,
isServerResetedFirstTime, isServerResetedFirstTime,
installationDialoguePopUp installationDialoguePopUp,
]; ];
final String? providerApiToken; final String? providerApiToken;
@ -317,7 +317,7 @@ class ServerInstallationRecovery extends ServerInstallationState {
isServerStarted, isServerStarted,
isServerResetedFirstTime, isServerResetedFirstTime,
currentStep, currentStep,
installationDialoguePopUp installationDialoguePopUp,
]; ];
ServerInstallationRecovery copyWith({ ServerInstallationRecovery copyWith({

2
lib/logic/cubit/server_jobs/server_jobs_cubit.dart
View File

@ -90,7 +90,7 @@ class ServerJobsCubit
ServerJobsState( ServerJobsState(
serverJobList: [ serverJobList: [
for (final ServerJob job in state.serverJobList) for (final ServerJob job in state.serverJobList)
if (job.uid != uid) job if (job.uid != uid) job,
], ],
), ),
); );

2
lib/logic/providers/dns_providers/cloudflare.dart
View File

@ -385,7 +385,7 @@ class CloudflareDnsProvider extends DnsProvider {
mx, mx,
txt1, txt1,
txt2, txt2,
vpn vpn,
]; ];
} }

2
lib/logic/providers/dns_providers/desec.dart
View File

@ -323,7 +323,7 @@ class DesecDnsProvider extends DnsProvider {
mx, mx,
txt1, txt1,
txt2, txt2,
vpn vpn,
]; ];
} }

2
lib/logic/providers/dns_providers/digital_ocean_dns.dart
View File

@ -276,7 +276,7 @@ class DigitalOceanDnsProvider extends DnsProvider {
mx, mx,
txt1, txt1,
txt2, txt2,
vpn vpn,
]; ];
} }

4
lib/ui/components/progress_bar/progress_bar.dart
View File

@ -78,7 +78,7 @@ class _ProgressBarState extends State<ProgressBar> {
end: Alignment.bottomRight, end: Alignment.bottomRight,
colors: [ colors: [
Theme.of(context).colorScheme.primary, Theme.of(context).colorScheme.primary,
Theme.of(context).colorScheme.secondary Theme.of(context).colorScheme.secondary,
], ],
), ),
), ),
@ -110,7 +110,7 @@ class _ProgressBarState extends State<ProgressBar> {
style: progressTextStyleLight, style: progressTextStyleLight,
children: [ children: [
TextSpan(text: '${index + 1}.', style: style), TextSpan(text: '${index + 1}.', style: style),
TextSpan(text: step, style: style) TextSpan(text: step, style: style),
], ],
), ),
), ),

2
lib/ui/helpers/empty_page_placeholder.dart
View File

@ -32,7 +32,7 @@ class EmptyPagePlaceholder extends StatelessWidget {
child: _expandedContent(context), child: _expandedContent(context),
), ),
), ),
) ),
], ],
); );

6
lib/ui/pages/backups/backup_details.dart
View File

@ -163,7 +163,7 @@ class BackupDetailsPage extends StatelessWidget {
autobackupPeriod != null autobackupPeriod != null
? 'backup.autobackup_period_subtitle'.tr( ? 'backup.autobackup_period_subtitle'.tr(
namedArgs: { namedArgs: {
'period': autobackupPeriod.toPrettyString(context.locale) 'period': autobackupPeriod.toPrettyString(context.locale),
}, },
) )
: 'backup.autobackup_period_never'.tr(), : 'backup.autobackup_period_never'.tr(),
@ -337,7 +337,7 @@ class BackupDetailsPage extends StatelessWidget {
actionButtonOnPressed: () => { actionButtonOnPressed: () => {
context.read<BackupsCubit>().forgetSnapshot( context.read<BackupsCubit>().forgetSnapshot(
backup.id, backup.id,
) ),
}, },
); );
}, },
@ -385,7 +385,7 @@ class BackupDetailsPage extends StatelessWidget {
), ),
onTap: () => onTap: () =>
context.pushRoute(BackupsListRoute(service: null)), context.pushRoute(BackupsListRoute(service: null)),
) ),
], ],
), ),
const SizedBox(height: 8), const SizedBox(height: 8),

120
lib/ui/pages/backups/backups_list.dart
View File

@ -39,68 +39,70 @@ class BackupsListPage extends StatelessWidget {
), ),
) )
else else
...backups.map((final Backup backup) { ...backups.map(
final service = context (final Backup backup) {
.read<ServicesCubit>() final service = context
.state .read<ServicesCubit>()
.getServiceById(backup.serviceId); .state
return ListTile( .getServiceById(backup.serviceId);
onTap: preventActions return ListTile(
? null onTap: preventActions
: () { ? null
showModalBottomSheet( : () {
useRootNavigator: true, showModalBottomSheet(
context: context, useRootNavigator: true,
isScrollControlled: true, context: context,
builder: (final BuildContext context) => isScrollControlled: true,
DraggableScrollableSheet( builder: (final BuildContext context) =>
expand: false, DraggableScrollableSheet(
maxChildSize: 0.9, expand: false,
minChildSize: 0.5, maxChildSize: 0.9,
initialChildSize: 0.7, minChildSize: 0.5,
builder: (final context, final scrollController) => initialChildSize: 0.7,
SnapshotModal( builder: (final context, final scrollController) =>
snapshot: backup, SnapshotModal(
scrollController: scrollController, snapshot: backup,
scrollController: scrollController,
),
), ),
);
},
onLongPress: preventActions
? null
: () {
showPopUpAlert(
alertTitle: 'backup.forget_snapshot'.tr(),
description: 'backup.forget_snapshot_alert'.tr(),
actionButtonTitle: 'backup.forget_snapshot'.tr(),
actionButtonOnPressed: () => {
context.read<BackupsCubit>().forgetSnapshot(
backup.id,
),
},
);
},
title: Text(
'${MaterialLocalizations.of(context).formatShortDate(backup.time)} ${TimeOfDay.fromDateTime(backup.time).format(context)}',
),
subtitle: Text(
service?.displayName ?? backup.fallbackServiceName,
),
leading: service != null
? SvgPicture.string(
service.svgIcon,
height: 24,
width: 24,
colorFilter: ColorFilter.mode(
Theme.of(context).colorScheme.onBackground,
BlendMode.srcIn,
), ),
); )
}, : const Icon(
onLongPress: preventActions Icons.question_mark_outlined,
? null
: () {
showPopUpAlert(
alertTitle: 'backup.forget_snapshot'.tr(),
description: 'backup.forget_snapshot_alert'.tr(),
actionButtonTitle: 'backup.forget_snapshot'.tr(),
actionButtonOnPressed: () => {
context.read<BackupsCubit>().forgetSnapshot(
backup.id,
)
},
);
},
title: Text(
'${MaterialLocalizations.of(context).formatShortDate(backup.time)} ${TimeOfDay.fromDateTime(backup.time).format(context)}',
),
subtitle: Text(
service?.displayName ?? backup.fallbackServiceName,
),
leading: service != null
? SvgPicture.string(
service.svgIcon,
height: 24,
width: 24,
colorFilter: ColorFilter.mode(
Theme.of(context).colorScheme.onBackground,
BlendMode.srcIn,
), ),
) );
: const Icon( },
Icons.question_mark_outlined, ),
),
);
})
], ],
); );
} }

2
lib/ui/pages/backups/snapshot_modal.dart
View File

@ -172,7 +172,7 @@ class _SnapshotModalState extends State<SnapshotModal> {
isWarning: true, isWarning: true,
text: 'backup.snapshot_modal_service_not_found'.tr(), text: 'backup.snapshot_modal_service_not_found'.tr(),
), ),
) ),
], ],
), ),
); );

2
lib/ui/pages/more/app_settings/app_settings.dart
View File

@ -62,7 +62,7 @@ class _AppSettingsPageState extends State<AppSettingsPage> {
), ),
const _ResetAppTile(), const _ResetAppTile(),
// const Divider(height: 0), // const Divider(height: 0),
_deleteServer(context) _deleteServer(context),
], ],
); );
} }

2
lib/ui/pages/more/more.dart
View File

@ -118,7 +118,7 @@ class MorePage extends StatelessWidget {
), ),
], ],
), ),
) ),
], ],
), ),
); );

2
lib/ui/pages/server_details/charts/chart.dart
View File

@ -113,7 +113,7 @@ class _Chart extends StatelessWidget {
titles: [ titles: [
'resource_chart.month'.tr(), 'resource_chart.month'.tr(),
'resource_chart.day'.tr(), 'resource_chart.day'.tr(),
'resource_chart.hour'.tr() 'resource_chart.hour'.tr(),
], ],
), ),
const SizedBox(height: 8), const SizedBox(height: 8),

6
lib/ui/pages/server_details/charts/network_charts.dart
View File

@ -113,7 +113,7 @@ class NetworkChart extends StatelessWidget {
minY: 0, minY: 0,
maxY: [ maxY: [
...listData[0].map((final e) => e.value), ...listData[0].map((final e) => e.value),
...listData[1].map((final e) => e.value) ...listData[1].map((final e) => e.value),
].reduce(max) * ].reduce(max) *
1.2, 1.2,
minX: 0, minX: 0,
@ -154,7 +154,7 @@ class NetworkChart extends StatelessWidget {
), ),
interval: [ interval: [
...listData[0].map((final e) => e.value), ...listData[0].map((final e) => e.value),
...listData[1].map((final e) => e.value) ...listData[1].map((final e) => e.value),
].reduce(max) * ].reduce(max) *
2 / 2 /
6.5, 6.5,
@ -168,7 +168,7 @@ class NetworkChart extends StatelessWidget {
verticalInterval: 40, verticalInterval: 40,
horizontalInterval: [ horizontalInterval: [
...listData[0].map((final e) => e.value), ...listData[0].map((final e) => e.value),
...listData[1].map((final e) => e.value) ...listData[1].map((final e) => e.value),
].reduce(max) * ].reduce(max) *
2 / 2 /
6.5, 6.5,

2
lib/ui/pages/services/service_page.dart
View File

@ -134,7 +134,7 @@ class _ServicePageState extends State<ServicePage> {
.read<ApiServerVolumeCubit>() .read<ApiServerVolumeCubit>()
.state .state
.getVolume(service.storageUsage.volume ?? '') .getVolume(service.storageUsage.volume ?? '')
.displayName .displayName,
}, },
), ),
style: Theme.of(context).textTheme.bodyMedium, style: Theme.of(context).textTheme.bodyMedium,

4
lib/ui/pages/services/services.dart
View File

@ -69,7 +69,7 @@ class _ServicesPageState extends State<ServicesPage> {
), ),
child: _Card(service: service), child: _Card(service: service),
), ),
) ),
], ],
), ),
), ),
@ -179,7 +179,7 @@ class _Card extends StatelessWidget {
), ),
const SizedBox(height: 8), const SizedBox(height: 8),
], ],
) ),
], ],
), ),
), ),

6
lib/ui/pages/setup/initializing/initializing.dart
View File

@ -49,7 +49,7 @@ class InitializingPage extends StatelessWidget {
() => _stepCheck(cubit), () => _stepCheck(cubit),
() => _stepCheck(cubit), () => _stepCheck(cubit),
() => _stepCheck(cubit), () => _stepCheck(cubit),
() => _stepCheck(cubit) () => _stepCheck(cubit),
][cubit.state.progress.index](); ][cubit.state.progress.index]();
} }
@ -193,7 +193,7 @@ class InitializingPage extends StatelessWidget {
.replace(const RecoveryRoute()); .replace(const RecoveryRoute());
}, },
), ),
) ),
], ],
), ),
], ],
@ -517,7 +517,7 @@ class InitializingPage extends StatelessWidget {
BrandTimer( BrandTimer(
startDateTime: state.timerStart!, startDateTime: state.timerStart!,
duration: state.duration!, duration: state.duration!,
) ),
], ],
), ),
if (state.isLoading) if (state.isLoading)

9
lib/ui/pages/setup/initializing/server_type_picker.dart
View File

@ -329,7 +329,7 @@ class SelectTypePage extends StatelessWidget {
'initializing.choose_server_type_payment_per_month' 'initializing.choose_server_type_payment_per_month'
.tr( .tr(
args: [ args: [
'${(type.price.value + storagePrice + publicIpPrice).toStringAsFixed(4)} ${type.price.currency.shortcode}' '${(type.price.value + storagePrice + publicIpPrice).toStringAsFixed(4)} ${type.price.currency.shortcode}',
], ],
), ),
style: Theme.of(context) style: Theme.of(context)
@ -371,7 +371,7 @@ class SelectTypePage extends StatelessWidget {
.tr( .tr(
args: [ args: [
type.price.value type.price.value
.toString() .toString(),
], ],
), ),
style: Theme.of(context) style: Theme.of(context)
@ -401,7 +401,7 @@ class SelectTypePage extends StatelessWidget {
'initializing.choose_server_type_payment_storage' 'initializing.choose_server_type_payment_storage'
.tr( .tr(
args: [ args: [
storagePrice.toString() storagePrice.toString(),
], ],
), ),
style: Theme.of(context) style: Theme.of(context)
@ -432,7 +432,8 @@ class SelectTypePage extends StatelessWidget {
'initializing.choose_server_type_payment_ip' 'initializing.choose_server_type_payment_ip'
.tr( .tr(
args: [ args: [
publicIpPrice.toString() publicIpPrice
.toString(),
], ],
), ),
style: Theme.of(context) style: Theme.of(context)

4
lib/ui/pages/setup/recovering/recover_by_new_device_key.dart
View File

@ -25,7 +25,7 @@ class RecoverByNewDeviceKeyInstruction extends StatelessWidget {
child: Text('recovering.method_device_button'.tr()), child: Text('recovering.method_device_button'.tr()),
onPressed: () => Navigator.of(context) onPressed: () => Navigator.of(context)
.push(materialRoute(const RecoverByNewDeviceKeyInput())), .push(materialRoute(const RecoverByNewDeviceKeyInput())),
) ),
], ],
); );
} }
@ -81,7 +81,7 @@ class RecoverByNewDeviceKeyInput extends StatelessWidget {
: () => : () =>
context.read<RecoveryDeviceFormCubit>().trySubmit(), context.read<RecoveryDeviceFormCubit>().trySubmit(),
child: Text('basis.continue'.tr()), child: Text('basis.continue'.tr()),
) ),
], ],
); );
}, },

4
lib/ui/pages/setup/recovering/recover_by_old_token.dart
View File

@ -41,7 +41,7 @@ class RecoverByOldTokenInstruction extends StatelessWidget {
onPressed: () => context onPressed: () => context
.read<ServerInstallationCubit>() .read<ServerInstallationCubit>()
.selectRecoveryMethod(ServerRecoveryMethods.oldToken), .selectRecoveryMethod(ServerRecoveryMethods.oldToken),
) ),
], ],
), ),
); );
@ -90,7 +90,7 @@ class RecoverByOldToken extends StatelessWidget {
? null ? null
: () => context.read<RecoveryDeviceFormCubit>().trySubmit(), : () => context.read<RecoveryDeviceFormCubit>().trySubmit(),
child: Text('basis.continue'.tr()), child: Text('basis.continue'.tr()),
) ),
], ],
); );
}, },

2
lib/ui/pages/setup/recovering/recover_by_recovery_key.dart
View File

@ -50,7 +50,7 @@ class RecoverByRecoveryKey extends StatelessWidget {
? null ? null
: () => context.read<RecoveryDeviceFormCubit>().trySubmit(), : () => context.read<RecoveryDeviceFormCubit>().trySubmit(),
child: Text('basis.continue'.tr()), child: Text('basis.continue'.tr()),
) ),
], ],
); );
}, },

2
lib/ui/pages/setup/recovering/recovery_confirm_server.dart
View File

@ -81,7 +81,7 @@ class _RecoveryConfirmServerState extends State<RecoveryConfirmServer> {
); );
} }
}, },
) ),
], ],
); );

2
lib/ui/pages/setup/recovering/recovery_method_select.dart
View File

@ -51,7 +51,7 @@ class RecoveryMethodSelect extends StatelessWidget {
title: 'recovering.method_select_nothing'.tr(), title: 'recovering.method_select_nothing'.tr(),
onPressed: () => Navigator.of(context) onPressed: () => Navigator.of(context)
.push(materialRoute(const RecoveryFallbackMethodSelect())), .push(materialRoute(const RecoveryFallbackMethodSelect())),
) ),
], ],
); );
} }

2
lib/ui/pages/setup/recovering/recovery_routing.dart
View File

@ -136,7 +136,7 @@ class SelectDomainToRecover extends StatelessWidget {
: () => : () =>
context.read<RecoveryDomainFormCubit>().trySubmit(), context.read<RecoveryDomainFormCubit>().trySubmit(),
child: Text('basis.continue'.tr()), child: Text('basis.continue'.tr()),
) ),
], ],
), ),
); );

4
lib/ui/pages/setup/recovering/recovery_server_provider_connected.dart
View File

@ -23,7 +23,7 @@ class RecoveryServerProviderConnected extends StatelessWidget {
heroTitle: 'recovering.provider_connected'.tr( heroTitle: 'recovering.provider_connected'.tr(
args: [ args: [
appConfig.state.serverDetails?.provider.displayName ?? appConfig.state.serverDetails?.provider.displayName ??
'Server Provider' 'Server Provider',
], ],
), ),
heroSubtitle: 'recovering.provider_connected_description'.tr( heroSubtitle: 'recovering.provider_connected_description'.tr(
@ -45,7 +45,7 @@ class RecoveryServerProviderConnected extends StatelessWidget {
labelText: 'recovering.provider_connected_placeholder'.tr( labelText: 'recovering.provider_connected_placeholder'.tr(
args: [ args: [
appConfig.state.serverDetails?.provider.displayName ?? appConfig.state.serverDetails?.provider.displayName ??
'Server Provider' 'Server Provider',
], ],
), ),
), ),

2
lib/ui/pages/users/user_details.dart
View File

@ -124,7 +124,7 @@ class _DeleteUserTile extends StatelessWidget {
), ),
], ],
), ),
) ),
}, },
leading: const Icon(Icons.person_remove_outlined), leading: const Icon(Icons.person_remove_outlined),
title: Text( title: Text(

2
lib/utils/breakpoints.dart
View File

@ -7,7 +7,7 @@ import 'package:flutter/material.dart';
const Set<TargetPlatform> _desktop = <TargetPlatform>{ const Set<TargetPlatform> _desktop = <TargetPlatform>{
TargetPlatform.linux, TargetPlatform.linux,
TargetPlatform.macOS, TargetPlatform.macOS,
TargetPlatform.windows TargetPlatform.windows,
}; };
const Set<TargetPlatform> _mobile = <TargetPlatform>{ const Set<TargetPlatform> _mobile = <TargetPlatform>{

51
lib/utils/extensions/text_extensions.dart
View File

@ -1,51 +0,0 @@
import 'package:flutter/material.dart';
extension TextExtension on Text {
Text withColor(final Color color) => Text(
data!,
key: key,
strutStyle: strutStyle,
textAlign: textAlign,
textDirection: textDirection,
locale: locale,
softWrap: softWrap,
overflow: overflow,
textScaleFactor: textScaleFactor,
maxLines: maxLines,
semanticsLabel: semanticsLabel,
textWidthBasis: textWidthBasis ?? textWidthBasis,
style: style != null
? style!.copyWith(color: color)
: TextStyle(color: color),
);
Text copyWith({
final Key? key,
final StrutStyle? strutStyle,
final TextAlign? textAlign,
final TextDirection? textDirection,
final Locale? locale,
final bool? softWrap,
final TextOverflow? overflow,
final double? textScaleFactor,
final int? maxLines,
final String? semanticsLabel,
final TextWidthBasis? textWidthBasis,
final TextStyle? style,
}) =>
Text(
data!,
key: key ?? this.key,
strutStyle: strutStyle ?? this.strutStyle,
textAlign: textAlign ?? this.textAlign,
textDirection: textDirection ?? this.textDirection,
locale: locale ?? this.locale,
softWrap: softWrap ?? this.softWrap,
overflow: overflow ?? this.overflow,
textScaleFactor: textScaleFactor ?? this.textScaleFactor,
maxLines: maxLines ?? this.maxLines,
semanticsLabel: semanticsLabel ?? this.semanticsLabel,
textWidthBasis: textWidthBasis ?? this.textWidthBasis,
style: style != null ? this.style?.merge(style) ?? style : this.style,
);
}