KazukyAkayashi/m3_lightmeter
KazukyAkayashi/m3_lightmeter
1
0
Fork 0
mirror of https://github.com/vodemn/m3_lightmeter.git synced 2024-11-21 23:10:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

made SliverScreen title a widget

Browse source
This commit is contained in:
Vadim 2024-10-21 11:40:11 +02:00
parent dbdc0577b0
commit cc2ab3b68a
5 changed files with 25 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
lib/screens/films/screen_films.dart
View file

@ -1,15 +1,9 @@
import 'package:flutter/material.dart';
import 'package:lightmeter/generated/l10n.dart';
import 'package:lightmeter/screens/settings/components/about/widget_settings_section_about.dart';
import 'package:lightmeter/screens/settings/components/general/widget_settings_section_general.dart';
import 'package:lightmeter/screens/settings/components/lightmeter_pro/widget_settings_section_lightmeter_pro.dart';
import 'package:lightmeter/screens/settings/components/metering/widget_settings_section_metering.dart';
import 'package:lightmeter/screens/settings/components/shared/expandable_section_list/components/expandable_section_list_item/widget_expandable_section_list_item.dart';
import 'package:lightmeter/providers/films_provider.dart';
import 'package:lightmeter/screens/films/components/film_formula_input/widget_film_formula_input.dart';
import 'package:lightmeter/screens/settings/components/shared/expandable_section_list/widget_expandable_section_list.dart';
import 'package:lightmeter/screens/settings/components/theme/widget_settings_section_theme.dart';
import 'package:lightmeter/screens/settings/flow_settings.dart';
import 'package:lightmeter/screens/shared/sliver_screen/screen_sliver.dart';
import 'package:lightmeter/utils/context_utils.dart';
import 'package:m3_lightmeter_iap/m3_lightmeter_iap.dart';
import 'package:m3_lightmeter_resources/m3_lightmeter_resources.dart';
@ -24,31 +18,29 @@ class _FilmsScreenState extends State<FilmsScreen> {
@override
Widget build(BuildContext context) {
return SliverScreen(
title: 'Films',
title: Text('Films'),
appBarActions: [
IconButton(
onPressed: () {},
onPressed: _addFilm,
icon: const Icon(Icons.add_outlined),
tooltip: S.of(context).tooltipAdd,
),
],
slivers: [
ExpandableSectionList<Film>(
values: films,
ExpandableSectionList<FilmExponential>(
values: [],
onSectionTitleTap: () {},
contentBuilder: (context, value) => [
ListTile(
leading: const Icon(Icons.iso),
title: Text(S.of(context).iso),
trailing: Text(value.iso.toString()),
onTap: () {
},
onTap: () {},
),
ListTile(
leading: const Icon(Icons.equalizer),
title: Text('Formula'),
trailing: Text('x^1.34'),
trailing: Text(value.exponent.toString()),
),
],
actionsBuilder: (context, value) => [
@ -68,4 +60,15 @@ class _FilmsScreenState extends State<FilmsScreen> {
],
);
}
void _addFilm([EquipmentProfile? copyFrom]) {
showDialog<String>(
context: context,
builder: (_) => const FilmFormulaDialog(),
).then((name) {
if (name != null) {
FilmsProvider.of(context).addFilm(name);
}
});
}
}

2
lib/screens/lightmeter_pro/screen_lightmeter_pro.dart
View file

@ -21,7 +21,7 @@ class LightmeterProScreen extends StatelessWidget {
children: [
Expanded(
child: SliverScreen(
title: S.of(context).proFeaturesTitle,
title: Text(S.of(context).proFeaturesTitle),
slivers: [
SliverToBoxAdapter(
child: Padding(

2
lib/screens/settings/components/metering/components/equipment_profiles/components/equipment_profile_screen/screen_equipment_profile.dart
View file

@ -28,7 +28,7 @@ class _EquipmentProfilesScreenState extends State<EquipmentProfilesScreen> {
@override
Widget build(BuildContext context) {
return SliverScreen(
title: S.of(context).equipmentProfiles,
title: Text(S.of(context).equipmentProfiles),
appBarActions: [
IconButton(
onPressed: _addProfile,

2
lib/screens/settings/screen_settings.dart
View file

@ -33,7 +33,7 @@ class _SettingsScreenState extends State<SettingsScreen> {
Widget build(BuildContext context) {
return ScaffoldMessenger(
child: SliverScreen(
title: S.of(context).settings,
title: Text(S.of(context).settings),
slivers: [
SliverList(
delegate: SliverChildListDelegate(

6
lib/screens/shared/sliver_screen/screen_sliver.dart
View file

@ -3,7 +3,7 @@ import 'package:lightmeter/generated/l10n.dart';
import 'package:lightmeter/res/dimens.dart';
class SliverScreen extends StatelessWidget {
final String title;
final Widget title;
final List<Widget> appBarActions;
final List<Widget> slivers;
@ -29,12 +29,12 @@ class SliverScreen extends StatelessWidget {
flexibleSpace: FlexibleSpaceBar(
centerTitle: false,
titlePadding: const EdgeInsets.all(Dimens.paddingM),
title: Text(
title,
title: DefaultTextStyle(
style: TextStyle(
color: Theme.of(context).colorScheme.onSurface,
fontSize: Dimens.grid24,
),
child: title,
),
),
actions: [