KazukyAkayashi/m3_lightmeter
KazukyAkayashi/m3_lightmeter
1
0
Fork 0
mirror of https://github.com/vodemn/m3_lightmeter.git synced 2025-03-12 05:10:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

typo

Browse source
This commit is contained in:
Vadim 2023-08-13 21:14:32 +02:00
parent 7dc3f22c66
commit c01cdc9dce
11 changed files with 56 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/providers.dart
View file

@ -7,7 +7,7 @@ import 'package:lightmeter/data/shared_prefs_service.dart';
import 'package:lightmeter/data/volume_events_service.dart';
import 'package:lightmeter/environment.dart';
import 'package:lightmeter/providers/equipment_profile_provider.dart';
import 'package:lightmeter/providers/service_provider.dart';
import 'package:lightmeter/providers/services_provider.dart';
import 'package:lightmeter/providers/user_preferences_provider.dart';
import 'package:platform/platform.dart';
import 'package:shared_preferences/shared_preferences.dart';
@ -27,7 +27,7 @@ class LightmeterProviders extends StatelessWidget {
]),
builder: (_, snapshot) {
if (snapshot.data != null) {
return ServiceProvider(
return ServicesProvider(
caffeineService: const CaffeineService(),
environment: env.copyWith(hasLightSensor: snapshot.data![1] as bool),
hapticsService: const HapticsService(),

12
lib/providers/equipment_profile_provider.dart
View file

@ -1,5 +1,5 @@
import 'package:flutter/material.dart';
import 'package:lightmeter/providers/service_provider.dart';
import 'package:lightmeter/providers/services_provider.dart';
import 'package:lightmeter/utils/inherited_generics.dart';
import 'package:m3_lightmeter_resources/m3_lightmeter_resources.dart';
import 'package:uuid/uuid.dart';
@ -35,7 +35,7 @@ class EquipmentProfileProviderState extends State<EquipmentProfileProvider> {
EquipmentProfile get _selectedProfile => _customProfiles.firstWhere(
(e) => e.id == _selectedId,
orElse: () {
ServiceProvider.userPreferencesServiceOf(context).selectedEquipmentProfileId =
ServicesProvider.userPreferencesServiceOf(context).selectedEquipmentProfileId =
_defaultProfile.id;
return _defaultProfile;
},
@ -44,8 +44,8 @@ class EquipmentProfileProviderState extends State<EquipmentProfileProvider> {
@override
void initState() {
super.initState();
_selectedId = ServiceProvider.userPreferencesServiceOf(context).selectedEquipmentProfileId;
_customProfiles = ServiceProvider.userPreferencesServiceOf(context).equipmentProfiles;
_selectedId = ServicesProvider.userPreferencesServiceOf(context).selectedEquipmentProfileId;
_customProfiles = ServicesProvider.userPreferencesServiceOf(context).equipmentProfiles;
}
@override
@ -63,7 +63,7 @@ class EquipmentProfileProviderState extends State<EquipmentProfileProvider> {
setState(() {
_selectedId = data.id;
});
ServiceProvider.userPreferencesServiceOf(context).selectedEquipmentProfileId =
ServicesProvider.userPreferencesServiceOf(context).selectedEquipmentProfileId =
_selectedProfile.id;
}
@ -96,7 +96,7 @@ class EquipmentProfileProviderState extends State<EquipmentProfileProvider> {
}
void _refreshSavedProfiles() {
ServiceProvider.userPreferencesServiceOf(context).equipmentProfiles = _customProfiles;
ServicesProvider.userPreferencesServiceOf(context).equipmentProfiles = _customProfiles;
setState(() {});
}
}

24
lib/providers/service_provider.dart → lib/providers/services_provider.dart
View file

@ -7,7 +7,7 @@ import 'package:lightmeter/data/shared_prefs_service.dart';
import 'package:lightmeter/data/volume_events_service.dart';
import 'package:lightmeter/environment.dart';
class ServiceProvider extends InheritedWidget {
class ServicesProvider extends InheritedWidget {
final CaffeineService caffeineService;
final Environment environment;
final HapticsService hapticsService;
@ -16,7 +16,7 @@ class ServiceProvider extends InheritedWidget {
final UserPreferencesService userPreferencesService;
final VolumeEventsService volumeEventsService;
const ServiceProvider({
const ServicesProvider({
required this.caffeineService,
required this.environment,
required this.hapticsService,
@ -28,37 +28,37 @@ class ServiceProvider extends InheritedWidget {
});
static CaffeineService caffeineServiceOf(BuildContext context) {
return ServiceProvider._of(context).caffeineService;
return ServicesProvider._of(context).caffeineService;
}
static Environment environmentOf(BuildContext context) {
return ServiceProvider._of(context).environment;
return ServicesProvider._of(context).environment;
}
static HapticsService hapticsServiceOf(BuildContext context) {
return ServiceProvider._of(context).hapticsService;
return ServicesProvider._of(context).hapticsService;
}
static LightSensorService lightSensorServiceOf(BuildContext context) {
return ServiceProvider._of(context).lightSensorService;
return ServicesProvider._of(context).lightSensorService;
}
static PermissionsService permissionsServiceOf(BuildContext context) {
return ServiceProvider._of(context).permissionsService;
return ServicesProvider._of(context).permissionsService;
}
static UserPreferencesService userPreferencesServiceOf(BuildContext context) {
return ServiceProvider._of(context).userPreferencesService;
return ServicesProvider._of(context).userPreferencesService;
}
static VolumeEventsService volumeEventsServiceOf(BuildContext context) {
return ServiceProvider._of(context).volumeEventsService;
return ServicesProvider._of(context).volumeEventsService;
}
static ServiceProvider _of(BuildContext context) {
return context.findAncestorWidgetOfExactType<ServiceProvider>()!;
static ServicesProvider _of(BuildContext context) {
return context.findAncestorWidgetOfExactType<ServicesProvider>()!;
}
@override
bool updateShouldNotify(ServiceProvider oldWidget) => false;
bool updateShouldNotify(ServicesProvider oldWidget) => false;
}

26
lib/providers/user_preferences_provider.dart
View file

@ -8,7 +8,7 @@ import 'package:lightmeter/data/models/supported_locale.dart';
import 'package:lightmeter/data/models/theme_type.dart';
import 'package:lightmeter/data/shared_prefs_service.dart';
import 'package:lightmeter/generated/l10n.dart';
import 'package:lightmeter/providers/service_provider.dart';
import 'package:lightmeter/providers/services_provider.dart';
import 'package:m3_lightmeter_resources/m3_lightmeter_resources.dart';
class UserPreferencesProvider extends StatefulWidget {
@ -71,12 +71,12 @@ class UserPreferencesProvider extends StatefulWidget {
class _UserPreferencesProviderState extends State<UserPreferencesProvider>
with WidgetsBindingObserver {
UserPreferencesService get userPreferencesService =>
ServiceProvider.userPreferencesServiceOf(context);
ServicesProvider.userPreferencesServiceOf(context);
late bool dynamicColor = userPreferencesService.dynamicColor;
late EvSourceType evSourceType;
late final MeteringScreenLayoutConfig meteringScreenLayout =
ServiceProvider.userPreferencesServiceOf(context).meteringScreenLayout;
ServicesProvider.userPreferencesServiceOf(context).meteringScreenLayout;
late Color primaryColor = userPreferencesService.primaryColor;
late StopType stopType = userPreferencesService.stopType;
late SupportedLocale locale = userPreferencesService.locale;
@ -85,9 +85,9 @@ class _UserPreferencesProviderState extends State<UserPreferencesProvider>
@override
void initState() {
super.initState();
evSourceType = ServiceProvider.userPreferencesServiceOf(context).evSourceType;
evSourceType = ServicesProvider.userPreferencesServiceOf(context).evSourceType;
evSourceType = evSourceType == EvSourceType.sensor &&
!ServiceProvider.environmentOf(context).hasLightSensor
!ServicesProvider.environmentOf(context).hasLightSensor
? EvSourceType.camera
: evSourceType;
WidgetsBinding.instance.addObserver(this);
@ -145,11 +145,11 @@ class _UserPreferencesProviderState extends State<UserPreferencesProvider>
setState(() {
dynamicColor = enable;
});
ServiceProvider.userPreferencesServiceOf(context).dynamicColor = enable;
ServicesProvider.userPreferencesServiceOf(context).dynamicColor = enable;
}
void toggleEvSourceType() {
if (!ServiceProvider.environmentOf(context).hasLightSensor) {
if (!ServicesProvider.environmentOf(context).hasLightSensor) {
return;
}
setState(() {
@ -160,7 +160,7 @@ class _UserPreferencesProviderState extends State<UserPreferencesProvider>
evSourceType = EvSourceType.camera;
}
});
ServiceProvider.userPreferencesServiceOf(context).evSourceType = evSourceType;
ServicesProvider.userPreferencesServiceOf(context).evSourceType = evSourceType;
}
void setLocale(SupportedLocale locale) {
@ -168,7 +168,7 @@ class _UserPreferencesProviderState extends State<UserPreferencesProvider>
setState(() {
this.locale = locale;
});
ServiceProvider.userPreferencesServiceOf(context).locale = locale;
ServicesProvider.userPreferencesServiceOf(context).locale = locale;
});
}
@ -182,28 +182,28 @@ class _UserPreferencesProviderState extends State<UserPreferencesProvider>
);
});
});
ServiceProvider.userPreferencesServiceOf(context).meteringScreenLayout = meteringScreenLayout;
ServicesProvider.userPreferencesServiceOf(context).meteringScreenLayout = meteringScreenLayout;
}
void setPrimaryColor(Color primaryColor) {
setState(() {
this.primaryColor = primaryColor;
});
ServiceProvider.userPreferencesServiceOf(context).primaryColor = primaryColor;
ServicesProvider.userPreferencesServiceOf(context).primaryColor = primaryColor;
}
void setStopType(StopType stopType) {
setState(() {
this.stopType = stopType;
});
ServiceProvider.userPreferencesServiceOf(context).stopType = stopType;
ServicesProvider.userPreferencesServiceOf(context).stopType = stopType;
}
void setThemeType(ThemeType themeType) {
setState(() {
this.themeType = themeType;
});
ServiceProvider.userPreferencesServiceOf(context).themeType = themeType;
ServicesProvider.userPreferencesServiceOf(context).themeType = themeType;
}
Brightness get _themeBrightness {

16
lib/screens/metering/flow_metering.dart
View file

@ -1,7 +1,7 @@
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:lightmeter/interactors/metering_interactor.dart';
import 'package:lightmeter/providers/service_provider.dart';
import 'package:lightmeter/providers/services_provider.dart';
import 'package:lightmeter/screens/metering/bloc_metering.dart';
import 'package:lightmeter/screens/metering/communication/bloc_communication_metering.dart';
import 'package:lightmeter/screens/metering/components/shared/volume_keys_notifier/notifier_volume_keys.dart';
@ -20,15 +20,15 @@ class _MeteringFlowState extends State<MeteringFlow> {
Widget build(BuildContext context) {
return InheritedWidgetBase<MeteringInteractor>(
data: MeteringInteractor(
ServiceProvider.userPreferencesServiceOf(context),
ServiceProvider.caffeineServiceOf(context),
ServiceProvider.hapticsServiceOf(context),
ServiceProvider.permissionsServiceOf(context),
ServiceProvider.lightSensorServiceOf(context),
ServiceProvider.volumeEventsServiceOf(context),
ServicesProvider.userPreferencesServiceOf(context),
ServicesProvider.caffeineServiceOf(context),
ServicesProvider.hapticsServiceOf(context),
ServicesProvider.permissionsServiceOf(context),
ServicesProvider.lightSensorServiceOf(context),
ServicesProvider.volumeEventsServiceOf(context),
)..initialize(),
child: InheritedWidgetBase<VolumeKeysNotifier>(
data: VolumeKeysNotifier(ServiceProvider.volumeEventsServiceOf(context)),
data: VolumeKeysNotifier(ServicesProvider.volumeEventsServiceOf(context)),
child: MultiBlocProvider(
providers: [
BlocProvider(create: (_) => MeteringCommunicationBloc()),

4
lib/screens/metering/screen_metering.dart
View file

@ -6,7 +6,7 @@ import 'package:lightmeter/data/models/ev_source_type.dart';
import 'package:lightmeter/data/models/exposure_pair.dart';
import 'package:lightmeter/data/models/film.dart';
import 'package:lightmeter/data/models/metering_screen_layout_config.dart';
import 'package:lightmeter/providers/service_provider.dart';
import 'package:lightmeter/providers/services_provider.dart';
import 'package:lightmeter/providers/user_preferences_provider.dart';
import 'package:lightmeter/screens/metering/bloc_metering.dart';
import 'package:lightmeter/screens/metering/components/bottom_controls/provider_bottom_controls.dart';
@ -45,7 +45,7 @@ class MeteringScreen extends StatelessWidget {
builder: (context, state) => MeteringBottomControlsProvider(
ev: state is MeteringDataState ? state.ev : null,
isMetering: state.isMetering,
onSwitchEvSourceType: ServiceProvider.environmentOf(context).hasLightSensor
onSwitchEvSourceType: ServicesProvider.environmentOf(context).hasLightSensor
? UserPreferencesProvider.of(context).toggleEvSourceType
: null,
onMeasure: () => context.read<MeteringBloc>().add(const MeasureEvent()),

4
lib/screens/settings/components/about/components/report_issue/widget_list_tile_report_issue.dart
View file

@ -1,6 +1,6 @@
import 'package:flutter/material.dart';
import 'package:lightmeter/generated/l10n.dart';
import 'package:lightmeter/providers/service_provider.dart';
import 'package:lightmeter/providers/services_provider.dart';
import 'package:url_launcher/url_launcher.dart';
class ReportIssueListTile extends StatelessWidget {
@ -13,7 +13,7 @@ class ReportIssueListTile extends StatelessWidget {
title: Text(S.of(context).reportIssue),
onTap: () {
launchUrl(
Uri.parse(ServiceProvider.environmentOf(context).issuesReportUrl),
Uri.parse(ServicesProvider.environmentOf(context).issuesReportUrl),
mode: LaunchMode.externalApplication,
);
},

4
lib/screens/settings/components/about/components/source_code/widget_list_tile_source_code.dart
View file

@ -1,6 +1,6 @@
import 'package:flutter/material.dart';
import 'package:lightmeter/generated/l10n.dart';
import 'package:lightmeter/providers/service_provider.dart';
import 'package:lightmeter/providers/services_provider.dart';
import 'package:url_launcher/url_launcher.dart';
class SourceCodeListTile extends StatelessWidget {
@ -13,7 +13,7 @@ class SourceCodeListTile extends StatelessWidget {
title: Text(S.of(context).sourceCode),
onTap: () {
launchUrl(
Uri.parse(ServiceProvider.environmentOf(context).sourceCodeUrl),
Uri.parse(ServicesProvider.environmentOf(context).sourceCodeUrl),
mode: LaunchMode.externalApplication,
);
},

4
lib/screens/settings/components/about/components/write_email/widget_list_tile_write_email.dart
View file

@ -1,7 +1,7 @@
import 'package:clipboard/clipboard.dart';
import 'package:flutter/material.dart';
import 'package:lightmeter/generated/l10n.dart';
import 'package:lightmeter/providers/service_provider.dart';
import 'package:lightmeter/providers/services_provider.dart';
import 'package:url_launcher/url_launcher.dart';
class WriteEmailListTile extends StatelessWidget {
@ -13,7 +13,7 @@ class WriteEmailListTile extends StatelessWidget {
leading: const Icon(Icons.email),
title: Text(S.of(context).writeEmail),
onTap: () {
final email = ServiceProvider.environmentOf(context).contactEmail;
final email = ServicesProvider.environmentOf(context).contactEmail;
final mailToUrl = Uri.parse('mailto:$email?subject=M3 Lightmeter');
canLaunchUrl(mailToUrl).then((canLaunch) {
if (canLaunch) {

4
lib/screens/settings/components/metering/components/calibration/components/calibration_dialog/widget_dialog_calibration.dart
View file

@ -1,7 +1,7 @@
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:lightmeter/generated/l10n.dart';
import 'package:lightmeter/providers/service_provider.dart';
import 'package:lightmeter/providers/services_provider.dart';
import 'package:lightmeter/res/dimens.dart';
import 'package:lightmeter/screens/settings/components/metering/components/calibration/components/calibration_dialog/bloc_dialog_calibration.dart';
import 'package:lightmeter/screens/settings/components/metering/components/calibration/components/calibration_dialog/event_dialog_calibration.dart';
@ -14,7 +14,7 @@ class CalibrationDialog extends StatelessWidget {
@override
Widget build(BuildContext context) {
final bool hasLightSensor = ServiceProvider.environmentOf(context).hasLightSensor;
final bool hasLightSensor = ServicesProvider.environmentOf(context).hasLightSensor;
return AlertDialog(
icon: const Icon(Icons.settings_brightness),
titlePadding: Dimens.dialogIconTitlePadding,

10
lib/screens/settings/flow_settings.dart
View file

@ -1,6 +1,6 @@
import 'package:flutter/material.dart';
import 'package:lightmeter/interactors/settings_interactor.dart';
import 'package:lightmeter/providers/service_provider.dart';
import 'package:lightmeter/providers/services_provider.dart';
import 'package:lightmeter/screens/settings/screen_settings.dart';
import 'package:lightmeter/utils/inherited_generics.dart';
@ -11,10 +11,10 @@ class SettingsFlow extends StatelessWidget {
Widget build(BuildContext context) {
return InheritedWidgetBase<SettingsInteractor>(
data: SettingsInteractor(
ServiceProvider.userPreferencesServiceOf(context),
ServiceProvider.caffeineServiceOf(context),
ServiceProvider.hapticsServiceOf(context),
ServiceProvider.volumeEventsServiceOf(context),
ServicesProvider.userPreferencesServiceOf(context),
ServicesProvider.caffeineServiceOf(context),
ServicesProvider.hapticsServiceOf(context),
ServicesProvider.volumeEventsServiceOf(context),
),
child: const SettingsScreen(),
);