Fabio/aves
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

minor fixes

Browse source
This commit is contained in:
Thibault Deckers 2022-03-18 09:24:28 +09:00
parent ad3b241e1d
commit d3ed1a0d8e
4 changed files with 32 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
lib/model/settings/defaults.dart
View file

@ -63,7 +63,6 @@ class SettingsDefaults {
EntryAction.rotateScreen,
EntryAction.toggleFavourite,
EntryAction.share,
EntryAction.edit,
EntryAction.delete,
];
static const showOverlayOnOpening = true;

5
lib/widgets/viewer/info/metadata/xmp_namespaces.dart
View file

@ -12,6 +12,7 @@ import 'package:aves/widgets/viewer/info/metadata/xmp_ns/exif.dart';
import 'package:aves/widgets/viewer/info/metadata/xmp_ns/google.dart';
import 'package:aves/widgets/viewer/info/metadata/xmp_ns/iptc.dart';
import 'package:aves/widgets/viewer/info/metadata/xmp_ns/iptc4xmpext.dart';
import 'package:aves/widgets/viewer/info/metadata/xmp_ns/microsoft.dart';
import 'package:aves/widgets/viewer/info/metadata/xmp_ns/mwg.dart';
import 'package:aves/widgets/viewer/info/metadata/xmp_ns/photoshop.dart';
import 'package:aves/widgets/viewer/info/metadata/xmp_ns/tiff.dart';
@ -60,6 +61,8 @@ class XmpNamespace extends Equatable {
return XmpMgwRegionsNamespace(rawProps);
case XmpMMNamespace.ns:
return XmpMMNamespace(rawProps);
case XmpMPNamespace.ns:
return XmpMPNamespace(rawProps);
case XmpNoteNamespace.ns:
return XmpNoteNamespace(rawProps);
case XmpPhotoshopNamespace.ns:
@ -151,7 +154,7 @@ class XmpNamespace extends Equatable {
? [
if (displayTitle.isNotEmpty)
Padding(
padding: const EdgeInsets.only(top: 8),
padding: const EdgeInsets.only(top: 8, bottom: 4),
child: HighlightTitle(
title: displayTitle,
color: context.select<AvesColorsData, Color?>((v) => v.fromBrandColor(BrandColors.get(displayTitle))),

25
lib/widgets/viewer/info/metadata/xmp_ns/microsoft.dart Normal file
View file

@ -0,0 +1,25 @@
import 'package:aves/widgets/viewer/info/metadata/xmp_namespaces.dart';
import 'package:aves/widgets/viewer/info/metadata/xmp_structs.dart';
import 'package:flutter/widgets.dart';
class XmpMPNamespace extends XmpNamespace {
static const ns = 'MP';
static final regionListPattern = RegExp(ns + r':RegionInfo/MPRI:Regions\[(\d+)\]/(.*)');
final regionList = <int, Map<String, String>>{};
XmpMPNamespace(Map<String, String> rawProps) : super(ns, rawProps);
@override
bool extractData(XmpProp prop) => extractIndexedStruct(prop, regionListPattern, regionList);
@override
List<Widget> buildFromExtractedData() => [
if (regionList.isNotEmpty)
XmpStructArrayCard(
title: 'Regions',
structByIndex: regionList,
),
];
}

3
lib/widgets/viewer/info/metadata/xmp_structs.dart
View file

@ -2,6 +2,7 @@ import 'dart:math';
import 'package:aves/theme/durations.dart';
import 'package:aves/theme/icons.dart';
import 'package:aves/theme/themes.dart';
import 'package:aves/utils/constants.dart';
import 'package:aves/widgets/common/basic/multi_cross_fader.dart';
import 'package:aves/widgets/common/extensions/build_context.dart';
@ -50,6 +51,7 @@ class _XmpStructArrayCardState extends State<XmpStructArrayCard> {
}
return Card(
color: Themes.thirdLayerColor(context),
margin: XmpStructCard.cardMargin,
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
@ -120,6 +122,7 @@ class XmpStructCard extends StatelessWidget {
@override
Widget build(BuildContext context) {
return Card(
color: Themes.thirdLayerColor(context),
margin: cardMargin,
child: Padding(
padding: const EdgeInsets.all(8),