mirror of
https://github.com/vodemn/m3_lightmeter.git
synced 2025-03-12 13:20:42 +00:00
typo
This commit is contained in:
parent
7dc3f22c66
commit
c01cdc9dce
11 changed files with 56 additions and 56 deletions
|
@ -7,7 +7,7 @@ import 'package:lightmeter/data/shared_prefs_service.dart';
|
||||||
import 'package:lightmeter/data/volume_events_service.dart';
|
import 'package:lightmeter/data/volume_events_service.dart';
|
||||||
import 'package:lightmeter/environment.dart';
|
import 'package:lightmeter/environment.dart';
|
||||||
import 'package:lightmeter/providers/equipment_profile_provider.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:lightmeter/providers/user_preferences_provider.dart';
|
||||||
import 'package:platform/platform.dart';
|
import 'package:platform/platform.dart';
|
||||||
import 'package:shared_preferences/shared_preferences.dart';
|
import 'package:shared_preferences/shared_preferences.dart';
|
||||||
|
@ -27,7 +27,7 @@ class LightmeterProviders extends StatelessWidget {
|
||||||
]),
|
]),
|
||||||
builder: (_, snapshot) {
|
builder: (_, snapshot) {
|
||||||
if (snapshot.data != null) {
|
if (snapshot.data != null) {
|
||||||
return ServiceProvider(
|
return ServicesProvider(
|
||||||
caffeineService: const CaffeineService(),
|
caffeineService: const CaffeineService(),
|
||||||
environment: env.copyWith(hasLightSensor: snapshot.data![1] as bool),
|
environment: env.copyWith(hasLightSensor: snapshot.data![1] as bool),
|
||||||
hapticsService: const HapticsService(),
|
hapticsService: const HapticsService(),
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
import 'package:flutter/material.dart';
|
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:lightmeter/utils/inherited_generics.dart';
|
||||||
import 'package:m3_lightmeter_resources/m3_lightmeter_resources.dart';
|
import 'package:m3_lightmeter_resources/m3_lightmeter_resources.dart';
|
||||||
import 'package:uuid/uuid.dart';
|
import 'package:uuid/uuid.dart';
|
||||||
|
@ -35,7 +35,7 @@ class EquipmentProfileProviderState extends State<EquipmentProfileProvider> {
|
||||||
EquipmentProfile get _selectedProfile => _customProfiles.firstWhere(
|
EquipmentProfile get _selectedProfile => _customProfiles.firstWhere(
|
||||||
(e) => e.id == _selectedId,
|
(e) => e.id == _selectedId,
|
||||||
orElse: () {
|
orElse: () {
|
||||||
ServiceProvider.userPreferencesServiceOf(context).selectedEquipmentProfileId =
|
ServicesProvider.userPreferencesServiceOf(context).selectedEquipmentProfileId =
|
||||||
_defaultProfile.id;
|
_defaultProfile.id;
|
||||||
return _defaultProfile;
|
return _defaultProfile;
|
||||||
},
|
},
|
||||||
|
@ -44,8 +44,8 @@ class EquipmentProfileProviderState extends State<EquipmentProfileProvider> {
|
||||||
@override
|
@override
|
||||||
void initState() {
|
void initState() {
|
||||||
super.initState();
|
super.initState();
|
||||||
_selectedId = ServiceProvider.userPreferencesServiceOf(context).selectedEquipmentProfileId;
|
_selectedId = ServicesProvider.userPreferencesServiceOf(context).selectedEquipmentProfileId;
|
||||||
_customProfiles = ServiceProvider.userPreferencesServiceOf(context).equipmentProfiles;
|
_customProfiles = ServicesProvider.userPreferencesServiceOf(context).equipmentProfiles;
|
||||||
}
|
}
|
||||||
|
|
||||||
@override
|
@override
|
||||||
|
@ -63,7 +63,7 @@ class EquipmentProfileProviderState extends State<EquipmentProfileProvider> {
|
||||||
setState(() {
|
setState(() {
|
||||||
_selectedId = data.id;
|
_selectedId = data.id;
|
||||||
});
|
});
|
||||||
ServiceProvider.userPreferencesServiceOf(context).selectedEquipmentProfileId =
|
ServicesProvider.userPreferencesServiceOf(context).selectedEquipmentProfileId =
|
||||||
_selectedProfile.id;
|
_selectedProfile.id;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -96,7 +96,7 @@ class EquipmentProfileProviderState extends State<EquipmentProfileProvider> {
|
||||||
}
|
}
|
||||||
|
|
||||||
void _refreshSavedProfiles() {
|
void _refreshSavedProfiles() {
|
||||||
ServiceProvider.userPreferencesServiceOf(context).equipmentProfiles = _customProfiles;
|
ServicesProvider.userPreferencesServiceOf(context).equipmentProfiles = _customProfiles;
|
||||||
setState(() {});
|
setState(() {});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -7,7 +7,7 @@ import 'package:lightmeter/data/shared_prefs_service.dart';
|
||||||
import 'package:lightmeter/data/volume_events_service.dart';
|
import 'package:lightmeter/data/volume_events_service.dart';
|
||||||
import 'package:lightmeter/environment.dart';
|
import 'package:lightmeter/environment.dart';
|
||||||
|
|
||||||
class ServiceProvider extends InheritedWidget {
|
class ServicesProvider extends InheritedWidget {
|
||||||
final CaffeineService caffeineService;
|
final CaffeineService caffeineService;
|
||||||
final Environment environment;
|
final Environment environment;
|
||||||
final HapticsService hapticsService;
|
final HapticsService hapticsService;
|
||||||
|
@ -16,7 +16,7 @@ class ServiceProvider extends InheritedWidget {
|
||||||
final UserPreferencesService userPreferencesService;
|
final UserPreferencesService userPreferencesService;
|
||||||
final VolumeEventsService volumeEventsService;
|
final VolumeEventsService volumeEventsService;
|
||||||
|
|
||||||
const ServiceProvider({
|
const ServicesProvider({
|
||||||
required this.caffeineService,
|
required this.caffeineService,
|
||||||
required this.environment,
|
required this.environment,
|
||||||
required this.hapticsService,
|
required this.hapticsService,
|
||||||
|
@ -28,37 +28,37 @@ class ServiceProvider extends InheritedWidget {
|
||||||
});
|
});
|
||||||
|
|
||||||
static CaffeineService caffeineServiceOf(BuildContext context) {
|
static CaffeineService caffeineServiceOf(BuildContext context) {
|
||||||
return ServiceProvider._of(context).caffeineService;
|
return ServicesProvider._of(context).caffeineService;
|
||||||
}
|
}
|
||||||
|
|
||||||
static Environment environmentOf(BuildContext context) {
|
static Environment environmentOf(BuildContext context) {
|
||||||
return ServiceProvider._of(context).environment;
|
return ServicesProvider._of(context).environment;
|
||||||
}
|
}
|
||||||
|
|
||||||
static HapticsService hapticsServiceOf(BuildContext context) {
|
static HapticsService hapticsServiceOf(BuildContext context) {
|
||||||
return ServiceProvider._of(context).hapticsService;
|
return ServicesProvider._of(context).hapticsService;
|
||||||
}
|
}
|
||||||
|
|
||||||
static LightSensorService lightSensorServiceOf(BuildContext context) {
|
static LightSensorService lightSensorServiceOf(BuildContext context) {
|
||||||
return ServiceProvider._of(context).lightSensorService;
|
return ServicesProvider._of(context).lightSensorService;
|
||||||
}
|
}
|
||||||
|
|
||||||
static PermissionsService permissionsServiceOf(BuildContext context) {
|
static PermissionsService permissionsServiceOf(BuildContext context) {
|
||||||
return ServiceProvider._of(context).permissionsService;
|
return ServicesProvider._of(context).permissionsService;
|
||||||
}
|
}
|
||||||
|
|
||||||
static UserPreferencesService userPreferencesServiceOf(BuildContext context) {
|
static UserPreferencesService userPreferencesServiceOf(BuildContext context) {
|
||||||
return ServiceProvider._of(context).userPreferencesService;
|
return ServicesProvider._of(context).userPreferencesService;
|
||||||
}
|
}
|
||||||
|
|
||||||
static VolumeEventsService volumeEventsServiceOf(BuildContext context) {
|
static VolumeEventsService volumeEventsServiceOf(BuildContext context) {
|
||||||
return ServiceProvider._of(context).volumeEventsService;
|
return ServicesProvider._of(context).volumeEventsService;
|
||||||
}
|
}
|
||||||
|
|
||||||
static ServiceProvider _of(BuildContext context) {
|
static ServicesProvider _of(BuildContext context) {
|
||||||
return context.findAncestorWidgetOfExactType<ServiceProvider>()!;
|
return context.findAncestorWidgetOfExactType<ServicesProvider>()!;
|
||||||
}
|
}
|
||||||
|
|
||||||
@override
|
@override
|
||||||
bool updateShouldNotify(ServiceProvider oldWidget) => false;
|
bool updateShouldNotify(ServicesProvider oldWidget) => false;
|
||||||
}
|
}
|
|
@ -8,7 +8,7 @@ import 'package:lightmeter/data/models/supported_locale.dart';
|
||||||
import 'package:lightmeter/data/models/theme_type.dart';
|
import 'package:lightmeter/data/models/theme_type.dart';
|
||||||
import 'package:lightmeter/data/shared_prefs_service.dart';
|
import 'package:lightmeter/data/shared_prefs_service.dart';
|
||||||
import 'package:lightmeter/generated/l10n.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';
|
import 'package:m3_lightmeter_resources/m3_lightmeter_resources.dart';
|
||||||
|
|
||||||
class UserPreferencesProvider extends StatefulWidget {
|
class UserPreferencesProvider extends StatefulWidget {
|
||||||
|
@ -71,12 +71,12 @@ class UserPreferencesProvider extends StatefulWidget {
|
||||||
class _UserPreferencesProviderState extends State<UserPreferencesProvider>
|
class _UserPreferencesProviderState extends State<UserPreferencesProvider>
|
||||||
with WidgetsBindingObserver {
|
with WidgetsBindingObserver {
|
||||||
UserPreferencesService get userPreferencesService =>
|
UserPreferencesService get userPreferencesService =>
|
||||||
ServiceProvider.userPreferencesServiceOf(context);
|
ServicesProvider.userPreferencesServiceOf(context);
|
||||||
|
|
||||||
late bool dynamicColor = userPreferencesService.dynamicColor;
|
late bool dynamicColor = userPreferencesService.dynamicColor;
|
||||||
late EvSourceType evSourceType;
|
late EvSourceType evSourceType;
|
||||||
late final MeteringScreenLayoutConfig meteringScreenLayout =
|
late final MeteringScreenLayoutConfig meteringScreenLayout =
|
||||||
ServiceProvider.userPreferencesServiceOf(context).meteringScreenLayout;
|
ServicesProvider.userPreferencesServiceOf(context).meteringScreenLayout;
|
||||||
late Color primaryColor = userPreferencesService.primaryColor;
|
late Color primaryColor = userPreferencesService.primaryColor;
|
||||||
late StopType stopType = userPreferencesService.stopType;
|
late StopType stopType = userPreferencesService.stopType;
|
||||||
late SupportedLocale locale = userPreferencesService.locale;
|
late SupportedLocale locale = userPreferencesService.locale;
|
||||||
|
@ -85,9 +85,9 @@ class _UserPreferencesProviderState extends State<UserPreferencesProvider>
|
||||||
@override
|
@override
|
||||||
void initState() {
|
void initState() {
|
||||||
super.initState();
|
super.initState();
|
||||||
evSourceType = ServiceProvider.userPreferencesServiceOf(context).evSourceType;
|
evSourceType = ServicesProvider.userPreferencesServiceOf(context).evSourceType;
|
||||||
evSourceType = evSourceType == EvSourceType.sensor &&
|
evSourceType = evSourceType == EvSourceType.sensor &&
|
||||||
!ServiceProvider.environmentOf(context).hasLightSensor
|
!ServicesProvider.environmentOf(context).hasLightSensor
|
||||||
? EvSourceType.camera
|
? EvSourceType.camera
|
||||||
: evSourceType;
|
: evSourceType;
|
||||||
WidgetsBinding.instance.addObserver(this);
|
WidgetsBinding.instance.addObserver(this);
|
||||||
|
@ -145,11 +145,11 @@ class _UserPreferencesProviderState extends State<UserPreferencesProvider>
|
||||||
setState(() {
|
setState(() {
|
||||||
dynamicColor = enable;
|
dynamicColor = enable;
|
||||||
});
|
});
|
||||||
ServiceProvider.userPreferencesServiceOf(context).dynamicColor = enable;
|
ServicesProvider.userPreferencesServiceOf(context).dynamicColor = enable;
|
||||||
}
|
}
|
||||||
|
|
||||||
void toggleEvSourceType() {
|
void toggleEvSourceType() {
|
||||||
if (!ServiceProvider.environmentOf(context).hasLightSensor) {
|
if (!ServicesProvider.environmentOf(context).hasLightSensor) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
setState(() {
|
setState(() {
|
||||||
|
@ -160,7 +160,7 @@ class _UserPreferencesProviderState extends State<UserPreferencesProvider>
|
||||||
evSourceType = EvSourceType.camera;
|
evSourceType = EvSourceType.camera;
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
ServiceProvider.userPreferencesServiceOf(context).evSourceType = evSourceType;
|
ServicesProvider.userPreferencesServiceOf(context).evSourceType = evSourceType;
|
||||||
}
|
}
|
||||||
|
|
||||||
void setLocale(SupportedLocale locale) {
|
void setLocale(SupportedLocale locale) {
|
||||||
|
@ -168,7 +168,7 @@ class _UserPreferencesProviderState extends State<UserPreferencesProvider>
|
||||||
setState(() {
|
setState(() {
|
||||||
this.locale = locale;
|
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) {
|
void setPrimaryColor(Color primaryColor) {
|
||||||
setState(() {
|
setState(() {
|
||||||
this.primaryColor = primaryColor;
|
this.primaryColor = primaryColor;
|
||||||
});
|
});
|
||||||
ServiceProvider.userPreferencesServiceOf(context).primaryColor = primaryColor;
|
ServicesProvider.userPreferencesServiceOf(context).primaryColor = primaryColor;
|
||||||
}
|
}
|
||||||
|
|
||||||
void setStopType(StopType stopType) {
|
void setStopType(StopType stopType) {
|
||||||
setState(() {
|
setState(() {
|
||||||
this.stopType = stopType;
|
this.stopType = stopType;
|
||||||
});
|
});
|
||||||
ServiceProvider.userPreferencesServiceOf(context).stopType = stopType;
|
ServicesProvider.userPreferencesServiceOf(context).stopType = stopType;
|
||||||
}
|
}
|
||||||
|
|
||||||
void setThemeType(ThemeType themeType) {
|
void setThemeType(ThemeType themeType) {
|
||||||
setState(() {
|
setState(() {
|
||||||
this.themeType = themeType;
|
this.themeType = themeType;
|
||||||
});
|
});
|
||||||
ServiceProvider.userPreferencesServiceOf(context).themeType = themeType;
|
ServicesProvider.userPreferencesServiceOf(context).themeType = themeType;
|
||||||
}
|
}
|
||||||
|
|
||||||
Brightness get _themeBrightness {
|
Brightness get _themeBrightness {
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:flutter_bloc/flutter_bloc.dart';
|
import 'package:flutter_bloc/flutter_bloc.dart';
|
||||||
import 'package:lightmeter/interactors/metering_interactor.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/bloc_metering.dart';
|
||||||
import 'package:lightmeter/screens/metering/communication/bloc_communication_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';
|
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) {
|
Widget build(BuildContext context) {
|
||||||
return InheritedWidgetBase<MeteringInteractor>(
|
return InheritedWidgetBase<MeteringInteractor>(
|
||||||
data: MeteringInteractor(
|
data: MeteringInteractor(
|
||||||
ServiceProvider.userPreferencesServiceOf(context),
|
ServicesProvider.userPreferencesServiceOf(context),
|
||||||
ServiceProvider.caffeineServiceOf(context),
|
ServicesProvider.caffeineServiceOf(context),
|
||||||
ServiceProvider.hapticsServiceOf(context),
|
ServicesProvider.hapticsServiceOf(context),
|
||||||
ServiceProvider.permissionsServiceOf(context),
|
ServicesProvider.permissionsServiceOf(context),
|
||||||
ServiceProvider.lightSensorServiceOf(context),
|
ServicesProvider.lightSensorServiceOf(context),
|
||||||
ServiceProvider.volumeEventsServiceOf(context),
|
ServicesProvider.volumeEventsServiceOf(context),
|
||||||
)..initialize(),
|
)..initialize(),
|
||||||
child: InheritedWidgetBase<VolumeKeysNotifier>(
|
child: InheritedWidgetBase<VolumeKeysNotifier>(
|
||||||
data: VolumeKeysNotifier(ServiceProvider.volumeEventsServiceOf(context)),
|
data: VolumeKeysNotifier(ServicesProvider.volumeEventsServiceOf(context)),
|
||||||
child: MultiBlocProvider(
|
child: MultiBlocProvider(
|
||||||
providers: [
|
providers: [
|
||||||
BlocProvider(create: (_) => MeteringCommunicationBloc()),
|
BlocProvider(create: (_) => MeteringCommunicationBloc()),
|
||||||
|
|
|
@ -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/exposure_pair.dart';
|
||||||
import 'package:lightmeter/data/models/film.dart';
|
import 'package:lightmeter/data/models/film.dart';
|
||||||
import 'package:lightmeter/data/models/metering_screen_layout_config.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/providers/user_preferences_provider.dart';
|
||||||
import 'package:lightmeter/screens/metering/bloc_metering.dart';
|
import 'package:lightmeter/screens/metering/bloc_metering.dart';
|
||||||
import 'package:lightmeter/screens/metering/components/bottom_controls/provider_bottom_controls.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(
|
builder: (context, state) => MeteringBottomControlsProvider(
|
||||||
ev: state is MeteringDataState ? state.ev : null,
|
ev: state is MeteringDataState ? state.ev : null,
|
||||||
isMetering: state.isMetering,
|
isMetering: state.isMetering,
|
||||||
onSwitchEvSourceType: ServiceProvider.environmentOf(context).hasLightSensor
|
onSwitchEvSourceType: ServicesProvider.environmentOf(context).hasLightSensor
|
||||||
? UserPreferencesProvider.of(context).toggleEvSourceType
|
? UserPreferencesProvider.of(context).toggleEvSourceType
|
||||||
: null,
|
: null,
|
||||||
onMeasure: () => context.read<MeteringBloc>().add(const MeasureEvent()),
|
onMeasure: () => context.read<MeteringBloc>().add(const MeasureEvent()),
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:lightmeter/generated/l10n.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';
|
import 'package:url_launcher/url_launcher.dart';
|
||||||
|
|
||||||
class ReportIssueListTile extends StatelessWidget {
|
class ReportIssueListTile extends StatelessWidget {
|
||||||
|
@ -13,7 +13,7 @@ class ReportIssueListTile extends StatelessWidget {
|
||||||
title: Text(S.of(context).reportIssue),
|
title: Text(S.of(context).reportIssue),
|
||||||
onTap: () {
|
onTap: () {
|
||||||
launchUrl(
|
launchUrl(
|
||||||
Uri.parse(ServiceProvider.environmentOf(context).issuesReportUrl),
|
Uri.parse(ServicesProvider.environmentOf(context).issuesReportUrl),
|
||||||
mode: LaunchMode.externalApplication,
|
mode: LaunchMode.externalApplication,
|
||||||
);
|
);
|
||||||
},
|
},
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:lightmeter/generated/l10n.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';
|
import 'package:url_launcher/url_launcher.dart';
|
||||||
|
|
||||||
class SourceCodeListTile extends StatelessWidget {
|
class SourceCodeListTile extends StatelessWidget {
|
||||||
|
@ -13,7 +13,7 @@ class SourceCodeListTile extends StatelessWidget {
|
||||||
title: Text(S.of(context).sourceCode),
|
title: Text(S.of(context).sourceCode),
|
||||||
onTap: () {
|
onTap: () {
|
||||||
launchUrl(
|
launchUrl(
|
||||||
Uri.parse(ServiceProvider.environmentOf(context).sourceCodeUrl),
|
Uri.parse(ServicesProvider.environmentOf(context).sourceCodeUrl),
|
||||||
mode: LaunchMode.externalApplication,
|
mode: LaunchMode.externalApplication,
|
||||||
);
|
);
|
||||||
},
|
},
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
import 'package:clipboard/clipboard.dart';
|
import 'package:clipboard/clipboard.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:lightmeter/generated/l10n.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';
|
import 'package:url_launcher/url_launcher.dart';
|
||||||
|
|
||||||
class WriteEmailListTile extends StatelessWidget {
|
class WriteEmailListTile extends StatelessWidget {
|
||||||
|
@ -13,7 +13,7 @@ class WriteEmailListTile extends StatelessWidget {
|
||||||
leading: const Icon(Icons.email),
|
leading: const Icon(Icons.email),
|
||||||
title: Text(S.of(context).writeEmail),
|
title: Text(S.of(context).writeEmail),
|
||||||
onTap: () {
|
onTap: () {
|
||||||
final email = ServiceProvider.environmentOf(context).contactEmail;
|
final email = ServicesProvider.environmentOf(context).contactEmail;
|
||||||
final mailToUrl = Uri.parse('mailto:$email?subject=M3 Lightmeter');
|
final mailToUrl = Uri.parse('mailto:$email?subject=M3 Lightmeter');
|
||||||
canLaunchUrl(mailToUrl).then((canLaunch) {
|
canLaunchUrl(mailToUrl).then((canLaunch) {
|
||||||
if (canLaunch) {
|
if (canLaunch) {
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:flutter_bloc/flutter_bloc.dart';
|
import 'package:flutter_bloc/flutter_bloc.dart';
|
||||||
import 'package:lightmeter/generated/l10n.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/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/bloc_dialog_calibration.dart';
|
||||||
import 'package:lightmeter/screens/settings/components/metering/components/calibration/components/calibration_dialog/event_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
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
final bool hasLightSensor = ServiceProvider.environmentOf(context).hasLightSensor;
|
final bool hasLightSensor = ServicesProvider.environmentOf(context).hasLightSensor;
|
||||||
return AlertDialog(
|
return AlertDialog(
|
||||||
icon: const Icon(Icons.settings_brightness),
|
icon: const Icon(Icons.settings_brightness),
|
||||||
titlePadding: Dimens.dialogIconTitlePadding,
|
titlePadding: Dimens.dialogIconTitlePadding,
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:lightmeter/interactors/settings_interactor.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/screens/settings/screen_settings.dart';
|
||||||
import 'package:lightmeter/utils/inherited_generics.dart';
|
import 'package:lightmeter/utils/inherited_generics.dart';
|
||||||
|
|
||||||
|
@ -11,10 +11,10 @@ class SettingsFlow extends StatelessWidget {
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
return InheritedWidgetBase<SettingsInteractor>(
|
return InheritedWidgetBase<SettingsInteractor>(
|
||||||
data: SettingsInteractor(
|
data: SettingsInteractor(
|
||||||
ServiceProvider.userPreferencesServiceOf(context),
|
ServicesProvider.userPreferencesServiceOf(context),
|
||||||
ServiceProvider.caffeineServiceOf(context),
|
ServicesProvider.caffeineServiceOf(context),
|
||||||
ServiceProvider.hapticsServiceOf(context),
|
ServicesProvider.hapticsServiceOf(context),
|
||||||
ServiceProvider.volumeEventsServiceOf(context),
|
ServicesProvider.volumeEventsServiceOf(context),
|
||||||
),
|
),
|
||||||
child: const SettingsScreen(),
|
child: const SettingsScreen(),
|
||||||
);
|
);
|
||||||
|
|
Loading…
Reference in a new issue