mirror of
https://github.com/vodemn/m3_lightmeter.git
synced 2024-12-04 21:30:39 +00:00
Compare commits
1 commit
ad9ce80490
...
228bcddc66
Author | SHA1 | Date | |
---|---|---|---|
|
228bcddc66 |
7 changed files with 86 additions and 118 deletions
|
@ -70,9 +70,8 @@ class FilmsProviderState extends State<FilmsProvider> {
|
|||
/* Custom films **/
|
||||
|
||||
Future<void> addCustomFilm(FilmExponential film) async {
|
||||
// ignore: avoid_redundant_argument_values
|
||||
await widget.filmsStorageService.addFilm(film, isUsed: true);
|
||||
customFilms[film.id] = (film: film, isUsed: true);
|
||||
await widget.filmsStorageService.addFilm(film);
|
||||
customFilms[film.id] = (film: film, isUsed: false);
|
||||
setState(() {});
|
||||
}
|
||||
|
||||
|
|
|
@ -45,18 +45,18 @@ class FilmEditBloc extends Bloc<FilmEditEvent, FilmEditState> {
|
|||
),
|
||||
) {
|
||||
on<FilmEditEvent>(
|
||||
(event, emit) async {
|
||||
(event, emit) {
|
||||
switch (event) {
|
||||
case final FilmEditNameChangedEvent e:
|
||||
await _onNameChanged(e, emit);
|
||||
_onNameChanged(e, emit);
|
||||
case final FilmEditIsoChangedEvent e:
|
||||
await _onIsoChanged(e, emit);
|
||||
_onIsoChanged(e, emit);
|
||||
case final FilmEditExpChangedEvent e:
|
||||
await _onExpChanged(e, emit);
|
||||
_onExpChanged(e, emit);
|
||||
case FilmEditSaveEvent():
|
||||
await _onSave(event, emit);
|
||||
_onSave(event, emit);
|
||||
case FilmEditDeleteEvent():
|
||||
await _onDelete(event, emit);
|
||||
_onDelete(event, emit);
|
||||
}
|
||||
},
|
||||
);
|
||||
|
@ -65,8 +65,10 @@ class FilmEditBloc extends Bloc<FilmEditEvent, FilmEditState> {
|
|||
Future<void> _onNameChanged(FilmEditNameChangedEvent event, Emitter emit) async {
|
||||
_newFilm = _newFilm.copyWith(name: event.name);
|
||||
emit(
|
||||
state.copyWith(
|
||||
FilmEditState(
|
||||
name: event.name,
|
||||
isoValue: state.isoValue,
|
||||
exponent: state.exponent,
|
||||
canSave: _canSave(event.name, state.exponent),
|
||||
),
|
||||
);
|
||||
|
@ -75,8 +77,10 @@ class FilmEditBloc extends Bloc<FilmEditEvent, FilmEditState> {
|
|||
Future<void> _onIsoChanged(FilmEditIsoChangedEvent event, Emitter emit) async {
|
||||
_newFilm = _newFilm.copyWith(iso: event.iso.value);
|
||||
emit(
|
||||
state.copyWith(
|
||||
FilmEditState(
|
||||
name: state.name,
|
||||
isoValue: event.iso,
|
||||
exponent: state.exponent,
|
||||
canSave: _canSave(state.name, state.exponent),
|
||||
),
|
||||
);
|
||||
|
@ -97,9 +101,8 @@ class FilmEditBloc extends Bloc<FilmEditEvent, FilmEditState> {
|
|||
}
|
||||
|
||||
Future<void> _onSave(FilmEditSaveEvent _, Emitter emit) async {
|
||||
emit(state.copyWith(isLoading: true));
|
||||
if (_isEdit) {
|
||||
await filmsProvider.updateCustomFilm(
|
||||
filmsProvider.updateCustomFilm(
|
||||
FilmExponential(
|
||||
id: _originalFilm.id,
|
||||
name: state.name,
|
||||
|
@ -108,7 +111,7 @@ class FilmEditBloc extends Bloc<FilmEditEvent, FilmEditState> {
|
|||
),
|
||||
);
|
||||
} else {
|
||||
await filmsProvider.addCustomFilm(
|
||||
filmsProvider.addCustomFilm(
|
||||
FilmExponential(
|
||||
id: const Uuid().v1(),
|
||||
name: state.name,
|
||||
|
@ -117,13 +120,10 @@ class FilmEditBloc extends Bloc<FilmEditEvent, FilmEditState> {
|
|||
),
|
||||
);
|
||||
}
|
||||
emit(state.copyWith(isLoading: false));
|
||||
}
|
||||
|
||||
Future<void> _onDelete(FilmEditDeleteEvent _, Emitter emit) async {
|
||||
emit(state.copyWith(isLoading: true));
|
||||
await filmsProvider.deleteCustomFilm(_originalFilm);
|
||||
emit(state.copyWith(isLoading: false));
|
||||
filmsProvider.deleteCustomFilm(_originalFilm);
|
||||
}
|
||||
|
||||
bool _canSave(String name, double? exponent) {
|
||||
|
|
|
@ -24,7 +24,6 @@ class FilmEditNameField extends StatelessWidget {
|
|||
),
|
||||
child: LightmeterTextField(
|
||||
initialValue: name,
|
||||
autofocus: true,
|
||||
maxLength: 48,
|
||||
hintText: S.of(context).name,
|
||||
onChanged: onChanged,
|
||||
|
|
|
@ -25,94 +25,79 @@ class FilmEditScreen extends StatefulWidget {
|
|||
class _FilmEditScreenState extends State<FilmEditScreen> {
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return BlocConsumer<FilmEditBloc, FilmEditState>(
|
||||
listenWhen: (previous, current) => previous.isLoading != current.isLoading,
|
||||
listener: (context, state) {
|
||||
if (state.isLoading) {
|
||||
FocusScope.of(context).unfocus();
|
||||
} else {
|
||||
Navigator.of(context).pop();
|
||||
}
|
||||
},
|
||||
buildWhen: (previous, current) => previous.isLoading != current.isLoading,
|
||||
builder: (context, state) => IgnorePointer(
|
||||
ignoring: state.isLoading,
|
||||
child: SliverScreen(
|
||||
title: Text(widget.isEdit ? S.of(context).editFilmTitle : S.of(context).addFilmTitle),
|
||||
appBarActions: [
|
||||
BlocBuilder<FilmEditBloc, FilmEditState>(
|
||||
buildWhen: (previous, current) => previous.canSave != current.canSave,
|
||||
builder: (context, state) => IconButton(
|
||||
onPressed: state.canSave
|
||||
? () {
|
||||
context.read<FilmEditBloc>().add(const FilmEditSaveEvent());
|
||||
}
|
||||
: null,
|
||||
icon: const Icon(Icons.save),
|
||||
),
|
||||
return SliverScreen(
|
||||
title: Text(widget.isEdit ? S.of(context).editFilmTitle : S.of(context).addFilmTitle),
|
||||
appBarActions: [
|
||||
BlocBuilder<FilmEditBloc, FilmEditState>(
|
||||
buildWhen: (previous, current) => previous.canSave != current.canSave,
|
||||
builder: (context, state) => IconButton(
|
||||
onPressed: state.canSave
|
||||
? () {
|
||||
context.read<FilmEditBloc>().add(const FilmEditSaveEvent());
|
||||
Navigator.of(context).pop();
|
||||
}
|
||||
: null,
|
||||
icon: const Icon(Icons.save),
|
||||
),
|
||||
),
|
||||
if (widget.isEdit)
|
||||
IconButton(
|
||||
onPressed: () {
|
||||
context.read<FilmEditBloc>().add(const FilmEditDeleteEvent());
|
||||
Navigator.of(context).pop();
|
||||
},
|
||||
icon: const Icon(Icons.delete),
|
||||
),
|
||||
],
|
||||
slivers: [
|
||||
SliverToBoxAdapter(
|
||||
child: Padding(
|
||||
padding: const EdgeInsets.fromLTRB(
|
||||
Dimens.paddingM,
|
||||
0,
|
||||
Dimens.paddingM,
|
||||
Dimens.paddingM,
|
||||
),
|
||||
if (widget.isEdit)
|
||||
IconButton(
|
||||
onPressed: () {
|
||||
context.read<FilmEditBloc>().add(const FilmEditDeleteEvent());
|
||||
},
|
||||
icon: const Icon(Icons.delete),
|
||||
),
|
||||
],
|
||||
slivers: [
|
||||
SliverToBoxAdapter(
|
||||
child: Card(
|
||||
child: Padding(
|
||||
padding: const EdgeInsets.fromLTRB(
|
||||
Dimens.paddingM,
|
||||
0,
|
||||
Dimens.paddingM,
|
||||
Dimens.paddingM,
|
||||
),
|
||||
child: Card(
|
||||
child: Padding(
|
||||
padding: const EdgeInsets.symmetric(vertical: Dimens.paddingM),
|
||||
child: Opacity(
|
||||
opacity: state.isLoading ? Dimens.disabledOpacity : Dimens.enabledOpacity,
|
||||
child: Column(
|
||||
children: [
|
||||
BlocBuilder<FilmEditBloc, FilmEditState>(
|
||||
buildWhen: (previous, current) => previous.name != current.name,
|
||||
builder: (context, state) => FilmEditNameField(
|
||||
name: state.name,
|
||||
onChanged: (value) {
|
||||
context.read<FilmEditBloc>().add(FilmEditNameChangedEvent(value));
|
||||
},
|
||||
),
|
||||
),
|
||||
BlocBuilder<FilmEditBloc, FilmEditState>(
|
||||
buildWhen: (previous, current) => previous.isoValue != current.isoValue,
|
||||
builder: (context, state) => FilmEditIsoPicker(
|
||||
selected: state.isoValue,
|
||||
onChanged: (value) {
|
||||
context.read<FilmEditBloc>().add(FilmEditIsoChangedEvent(value));
|
||||
},
|
||||
),
|
||||
),
|
||||
BlocBuilder<FilmEditBloc, FilmEditState>(
|
||||
buildWhen: (previous, current) => previous.exponent != current.exponent,
|
||||
builder: (context, state) => FilmEditExponentialFormulaInput(
|
||||
value: state.exponent,
|
||||
onChanged: (value) {
|
||||
context.read<FilmEditBloc>().add(FilmEditExpChangedEvent(value));
|
||||
},
|
||||
),
|
||||
),
|
||||
],
|
||||
padding: const EdgeInsets.symmetric(vertical: Dimens.paddingM),
|
||||
child: Column(
|
||||
children: [
|
||||
BlocBuilder<FilmEditBloc, FilmEditState>(
|
||||
buildWhen: (previous, current) => previous.name != current.name,
|
||||
builder: (context, state) => FilmEditNameField(
|
||||
name: state.name,
|
||||
onChanged: (value) {
|
||||
context.read<FilmEditBloc>().add(FilmEditNameChangedEvent(value));
|
||||
},
|
||||
),
|
||||
),
|
||||
),
|
||||
BlocBuilder<FilmEditBloc, FilmEditState>(
|
||||
buildWhen: (previous, current) => previous.isoValue != current.isoValue,
|
||||
builder: (context, state) => FilmEditIsoPicker(
|
||||
selected: state.isoValue,
|
||||
onChanged: (value) {
|
||||
context.read<FilmEditBloc>().add(FilmEditIsoChangedEvent(value));
|
||||
},
|
||||
),
|
||||
),
|
||||
BlocBuilder<FilmEditBloc, FilmEditState>(
|
||||
buildWhen: (previous, current) => previous.exponent != current.exponent,
|
||||
builder: (context, state) => FilmEditExponentialFormulaInput(
|
||||
value: state.exponent,
|
||||
onChanged: (value) {
|
||||
context.read<FilmEditBloc>().add(FilmEditExpChangedEvent(value));
|
||||
},
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
SliverToBoxAdapter(child: SizedBox(height: MediaQuery.paddingOf(context).bottom)),
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
SliverToBoxAdapter(child: SizedBox(height: MediaQuery.paddingOf(context).bottom)),
|
||||
],
|
||||
);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -5,28 +5,13 @@ class FilmEditState {
|
|||
final IsoValue isoValue;
|
||||
final double? exponent;
|
||||
final bool canSave;
|
||||
final bool isLoading;
|
||||
final FilmExponential? filmToSave;
|
||||
|
||||
const FilmEditState({
|
||||
required this.name,
|
||||
required this.isoValue,
|
||||
required this.exponent,
|
||||
required this.canSave,
|
||||
this.isLoading = false,
|
||||
this.filmToSave,
|
||||
});
|
||||
|
||||
FilmEditState copyWith({
|
||||
String? name,
|
||||
IsoValue? isoValue,
|
||||
double? exponent,
|
||||
bool? canSave,
|
||||
bool? isLoading,
|
||||
}) =>
|
||||
FilmEditState(
|
||||
name: name ?? this.name,
|
||||
isoValue: isoValue ?? this.isoValue,
|
||||
exponent: exponent ?? this.exponent,
|
||||
canSave: canSave ?? this.canSave,
|
||||
isLoading: isLoading ?? this.isLoading,
|
||||
);
|
||||
}
|
||||
|
|
|
@ -3,7 +3,7 @@ import 'package:flutter/material.dart';
|
|||
class LightmeterTextField extends TextFormField {
|
||||
LightmeterTextField({
|
||||
super.controller,
|
||||
super.autofocus,
|
||||
super.focusNode,
|
||||
super.initialValue,
|
||||
super.inputFormatters,
|
||||
super.maxLength,
|
||||
|
|
|
@ -30,7 +30,7 @@ dependencies:
|
|||
m3_lightmeter_iap:
|
||||
git:
|
||||
url: "https://github.com/vodemn/m3_lightmeter_iap"
|
||||
ref: v1.1.0
|
||||
ref: v1.0.0
|
||||
m3_lightmeter_resources:
|
||||
git:
|
||||
url: "https://github.com/vodemn/m3_lightmeter_resources"
|
||||
|
|
Loading…
Reference in a new issue