moved date to title

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",

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",

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",

lib/l10n/intl_ru.arb

@@ -160,7 +160,6 @@
   "addEquipmentProfileTitle": "Добавить профиль",
   "editEquipmentProfileTitle": "Редактировать профиль",
   "editPhotoTitle": "Редактировать фото",
-  "date": "Дата",
   "ndFilter": "ND фильтр",
   "note": "Заметка",
   "notSet": "Не задано",

lib/l10n/intl_zh.arb

@@ -158,7 +158,6 @@
   "addEquipmentProfileTitle": "添加设备",
   "editEquipmentProfileTitle": "编辑设备",
   "editPhotoTitle": "编辑照片",
-  "date": "日期",
   "ndFilter": "ND 滤镜",
   "note": "备注",
   "notSet": "未设置",

lib/screens/logbook_photo_edit/screen_logbook_photo_edit.dart

@@ -37,6 +37,7 @@ class _LogbookPhotoEditScreenState extends State<LogbookPhotoEditScreen> {
       builder: (context, state) => IgnorePointer(
         ignoring: state.isLoading,
         child: SliverScreen(
+          title: Text(_formatDate(state.timestamp)),
           appBarActions: [
             BlocBuilder<LogbookPhotoEditBloc, LogbookPhotoEditState>(
               buildWhen: (previous, current) => previous.canSave != current.canSave,
@@ -60,29 +61,30 @@ class _LogbookPhotoEditScreenState extends State<LogbookPhotoEditScreen> {
             SliverToBoxAdapter(
               child: Opacity(
                 opacity: state.isLoading ? Dimens.disabledOpacity : Dimens.enabledOpacity,
-                child: const Column(
+                child: const Padding(
-                  children: [
+                  padding: EdgeInsets.symmetric(horizontal: Dimens.paddingM),
-                    _PhotoPreviewBuilder(),
+                  child: Column(
-                    Card(
+                    children: [
-                      margin: EdgeInsets.all(Dimens.paddingM),
+                      _PhotoPreviewBuilder(),
-                      child: Padding(
+                      SizedBox(height: Dimens.grid16),
-                        padding: EdgeInsets.symmetric(vertical: Dimens.paddingM),
+                      Card(
-                        child: Column(
+                        child: Padding(
-                          children: [
+                          padding: EdgeInsets.symmetric(vertical: Dimens.paddingM),
-                            _DateListTile(),
+                          child: Column(
-                            //TODO: maybe make it edge to edge and add InterActiveViewer
+                            children: [
-                            LogbookPhotoCoordinatesListTile(),
+                              LogbookPhotoCoordinatesListTile(),
-                            _NoteListTile(),
+                              _NoteListTile(),
-                            _EvListTile(),
+                              _EvListTile(),
-                            _IsoListTile(),
+                              _IsoListTile(),
-                            _NdFilterListTile(),
+                              _NdFilterListTile(),
-                            _AperturePickerListTile(),
+                              _AperturePickerListTile(),
-                            _ShutterSpeedPickerListTile(),
+                              _ShutterSpeedPickerListTile(),
-                          ],
+                            ],
+                          ),
                         ),
                       ),
-                    ),
+                    ],
-                  ],
+                  ),
                 ),
               ),
             ),
@@ -92,6 +94,15 @@ class _LogbookPhotoEditScreenState extends State<LogbookPhotoEditScreen> {
       ),
     );
   }
+
+  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
+          child: ClipRRect(
-              ? Image.asset(
+            borderRadius: BorderRadius.circular(Dimens.borderRadiusM),
-                  PlatformConfig.cameraStubImage,
+            child: PlatformConfig.cameraStubImage.isNotEmpty
-                  fit: BoxFit.cover,
+                ? Image.asset(
-                )
+                    PlatformConfig.cameraStubImage,
-              : Image.file(
+                    fit: BoxFit.cover,
-                  File(state.name),
+                  )
-                  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<LogbookPhotoEditBloc, LogbookPhotoEditState>(
-      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();