From 3cd4d32a2b64118a850ce14005f44676c91aecbd Mon Sep 17 00:00:00 2001 From: Vadim <44135514+vodemn@users.noreply.github.com> Date: Sat, 19 Jul 2025 19:00:47 +0200 Subject: [PATCH] moved date to title --- lib/l10n/intl_de.arb | 1 - lib/l10n/intl_en.arb | 1 - lib/l10n/intl_fr.arb | 1 - lib/l10n/intl_ru.arb | 1 - lib/l10n/intl_zh.arb | 1 - .../screen_logbook_photo_edit.dart | 99 +++++++++---------- 6 files changed, 44 insertions(+), 60 deletions(-) diff --git a/lib/l10n/intl_de.arb b/lib/l10n/intl_de.arb index 34f4039..c397307 100644 --- a/lib/l10n/intl_de.arb +++ b/lib/l10n/intl_de.arb @@ -170,7 +170,6 @@ "addEquipmentProfileTitle": "Ausrüstung hinzufügen", "editEquipmentProfileTitle": "Ausrüstung bearbeiten", "editPhotoTitle": "Foto bearbeiten", - "date": "Datum", "ndFilter": "ND Filter", "note": "Notiz", "notSet": "Nicht gesetzt", diff --git a/lib/l10n/intl_en.arb b/lib/l10n/intl_en.arb index 0c6d47c..ce1a9e1 100644 --- a/lib/l10n/intl_en.arb +++ b/lib/l10n/intl_en.arb @@ -170,7 +170,6 @@ "addEquipmentProfileTitle": "Add equipment", "editEquipmentProfileTitle": "Edit equipment", "editPhotoTitle": "Edit Photo", - "date": "Date", "ndFilter": "ND Filter", "note": "Note", "notSet": "Not set", diff --git a/lib/l10n/intl_fr.arb b/lib/l10n/intl_fr.arb index 59dadd3..901d38a 100644 --- a/lib/l10n/intl_fr.arb +++ b/lib/l10n/intl_fr.arb @@ -161,7 +161,6 @@ "addEquipmentProfileTitle": "Ajouter un profil", "editEquipmentProfileTitle": "Editer le profil", "editPhotoTitle": "Modifier la photo", - "date": "Date", "ndFilter": "Filtre ND", "note": "Note", "notSet": "Non défini", diff --git a/lib/l10n/intl_ru.arb b/lib/l10n/intl_ru.arb index a815bc2..e276ccc 100644 --- a/lib/l10n/intl_ru.arb +++ b/lib/l10n/intl_ru.arb @@ -160,7 +160,6 @@ "addEquipmentProfileTitle": "Добавить профиль", "editEquipmentProfileTitle": "Редактировать профиль", "editPhotoTitle": "Редактировать фото", - "date": "Дата", "ndFilter": "ND фильтр", "note": "Заметка", "notSet": "Не задано", diff --git a/lib/l10n/intl_zh.arb b/lib/l10n/intl_zh.arb index ca4dc9d..7ecbe52 100644 --- a/lib/l10n/intl_zh.arb +++ b/lib/l10n/intl_zh.arb @@ -158,7 +158,6 @@ "addEquipmentProfileTitle": "添加设备", "editEquipmentProfileTitle": "编辑设备", "editPhotoTitle": "编辑照片", - "date": "日期", "ndFilter": "ND 滤镜", "note": "备注", "notSet": "未设置", diff --git a/lib/screens/logbook_photo_edit/screen_logbook_photo_edit.dart b/lib/screens/logbook_photo_edit/screen_logbook_photo_edit.dart index 680909a..c9de7f4 100644 --- a/lib/screens/logbook_photo_edit/screen_logbook_photo_edit.dart +++ b/lib/screens/logbook_photo_edit/screen_logbook_photo_edit.dart @@ -37,6 +37,7 @@ class _LogbookPhotoEditScreenState extends State { builder: (context, state) => IgnorePointer( ignoring: state.isLoading, child: SliverScreen( + title: Text(_formatDate(state.timestamp)), appBarActions: [ BlocBuilder( buildWhen: (previous, current) => previous.canSave != current.canSave, @@ -60,29 +61,30 @@ class _LogbookPhotoEditScreenState extends State { SliverToBoxAdapter( child: Opacity( opacity: state.isLoading ? Dimens.disabledOpacity : Dimens.enabledOpacity, - child: const Column( - children: [ - _PhotoPreviewBuilder(), - Card( - margin: EdgeInsets.all(Dimens.paddingM), - child: Padding( - padding: EdgeInsets.symmetric(vertical: Dimens.paddingM), - child: Column( - children: [ - _DateListTile(), - //TODO: maybe make it edge to edge and add InterActiveViewer - LogbookPhotoCoordinatesListTile(), - _NoteListTile(), - _EvListTile(), - _IsoListTile(), - _NdFilterListTile(), - _AperturePickerListTile(), - _ShutterSpeedPickerListTile(), - ], + child: const Padding( + padding: EdgeInsets.symmetric(horizontal: Dimens.paddingM), + child: Column( + children: [ + _PhotoPreviewBuilder(), + SizedBox(height: Dimens.grid16), + Card( + child: Padding( + padding: EdgeInsets.symmetric(vertical: Dimens.paddingM), + child: Column( + children: [ + LogbookPhotoCoordinatesListTile(), + _NoteListTile(), + _EvListTile(), + _IsoListTile(), + _NdFilterListTile(), + _AperturePickerListTile(), + _ShutterSpeedPickerListTile(), + ], + ), ), ), - ), - ], + ], + ), ), ), ), @@ -92,6 +94,15 @@ class _LogbookPhotoEditScreenState extends State { ), ); } + + String _formatDate(DateTime dateTime) { + final day = dateTime.day.toString().padLeft(2, '0'); + final month = dateTime.month.toString().padLeft(2, '0'); + final year = dateTime.year.toString(); + final hour = dateTime.hour.toString().padLeft(2, '0'); + final minute = dateTime.minute.toString().padLeft(2, '0'); + return '$day.$month.$year $hour:$minute'; + } } class _PhotoPreviewBuilder extends StatelessWidget { @@ -105,46 +116,24 @@ class _PhotoPreviewBuilder extends StatelessWidget { aspectRatio: PlatformConfig.cameraPreviewAspectRatio, child: Hero( tag: state.id, - child: PlatformConfig.cameraStubImage.isNotEmpty - ? Image.asset( - PlatformConfig.cameraStubImage, - fit: BoxFit.cover, - ) - : Image.file( - File(state.name), - fit: BoxFit.cover, - ), + child: ClipRRect( + borderRadius: BorderRadius.circular(Dimens.borderRadiusM), + child: PlatformConfig.cameraStubImage.isNotEmpty + ? Image.asset( + PlatformConfig.cameraStubImage, + fit: BoxFit.cover, + ) + : Image.file( + File(state.name), + fit: BoxFit.cover, + ), + ), ), ), ); } } -class _DateListTile extends StatelessWidget { - const _DateListTile(); - - String _formatDate(DateTime dateTime) { - final day = dateTime.day.toString().padLeft(2, '0'); - final month = dateTime.month.toString().padLeft(2, '0'); - final year = dateTime.year.toString(); - final hour = dateTime.hour.toString().padLeft(2, '0'); - final minute = dateTime.minute.toString().padLeft(2, '0'); - return '$day.$month.$year $hour:$minute'; - } - - @override - Widget build(BuildContext context) { - return BlocBuilder( - buildWhen: (_, __) => false, - builder: (context, state) => ListTile( - leading: const Icon(Icons.access_time), - title: Text(S.of(context).date), - trailing: Text(_formatDate(state.timestamp)), - ), - ); - } -} - class _NoteListTile extends StatelessWidget { const _NoteListTile();