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

minor fixes

Browse source
This commit is contained in:
Thibault Deckers 2022-07-24 22:09:41 +02:00
parent dea5ab16e0
commit 2b4910189b
4 changed files with 33 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
android/app/src/main/kotlin/deckers/thibault/aves/AnalysisService.kt
View file

@ -73,7 +73,7 @@ class AnalysisService : MethodChannel.MethodCallHandler, Service() {
override fun onBind(intent: Intent) = analysisServiceBinder override fun onBind(intent: Intent) = analysisServiceBinder
override fun onStartCommand(intent: Intent, flags: Int, startId: Int): Int { override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
val channel = NotificationChannelCompat.Builder(CHANNEL_ANALYSIS, NotificationManagerCompat.IMPORTANCE_LOW) val channel = NotificationChannelCompat.Builder(CHANNEL_ANALYSIS, NotificationManagerCompat.IMPORTANCE_LOW)
.setName(getText(R.string.analysis_channel_name)) .setName(getText(R.string.analysis_channel_name))
.setShowBadge(false) .setShowBadge(false)
@ -82,7 +82,7 @@ class AnalysisService : MethodChannel.MethodCallHandler, Service() {
startForeground(NOTIFICATION_ID, buildNotification()) startForeground(NOTIFICATION_ID, buildNotification())
val msgData = Bundle() val msgData = Bundle()
intent.extras?.let { intent?.extras?.let {
msgData.putAll(it) msgData.putAll(it)
} }
serviceHandler?.obtainMessage()?.let { msg -> serviceHandler?.obtainMessage()?.let { msg ->

4
lib/widgets/common/tile_extent_controller.dart
View file

@ -84,7 +84,9 @@ class TileExtentController {
int _effectiveColumnCountForExtent(double extent) { int _effectiveColumnCountForExtent(double extent) {
if (extent > 0) { if (extent > 0) {
final columnCount = _columnCountForExtent(extent); final columnCount = _columnCountForExtent(extent);
return columnCount.clamp(_effectiveColumnCountMin(), _effectiveColumnCountMax()).round(); final countMin = _effectiveColumnCountMin();
final countMax = _effectiveColumnCountMax();
return columnCount.clamp(countMin, max(countMin, countMax)).round();
} }
return columnCountDefault; return columnCountDefault;
} }

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

@ -15,6 +15,7 @@ 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/microsoft.dart';
import 'package:aves/widgets/viewer/info/metadata/xmp_ns/mwg.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/photoshop.dart';
import 'package:aves/widgets/viewer/info/metadata/xmp_ns/plus.dart';
import 'package:aves/widgets/viewer/info/metadata/xmp_ns/tiff.dart'; import 'package:aves/widgets/viewer/info/metadata/xmp_ns/tiff.dart';
import 'package:aves/widgets/viewer/info/metadata/xmp_ns/xmp.dart'; import 'package:aves/widgets/viewer/info/metadata/xmp_ns/xmp.dart';
import 'package:collection/collection.dart'; import 'package:collection/collection.dart';
@ -67,6 +68,8 @@ class XmpNamespace extends Equatable {
return XmpNoteNamespace(rawProps); return XmpNoteNamespace(rawProps);
case XmpPhotoshopNamespace.ns: case XmpPhotoshopNamespace.ns:
return XmpPhotoshopNamespace(rawProps); return XmpPhotoshopNamespace(rawProps);
case XmpPlusNamespace.ns:
return XmpPlusNamespace(rawProps);
case XmpTiffNamespace.ns: case XmpTiffNamespace.ns:
return XmpTiffNamespace(rawProps); return XmpTiffNamespace(rawProps);
default: default:

25
lib/widgets/viewer/info/metadata/xmp_ns/plus.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/material.dart';
class XmpPlusNamespace extends XmpNamespace {
static const ns = 'plus';
static final licensorPattern = RegExp(ns + r':Licensor\[(\d+)\]/(.*)');
final licensor = <int, Map<String, String>>{};
XmpPlusNamespace(Map<String, String> rawProps) : super(ns, rawProps);
@override
bool extractData(XmpProp prop) => extractIndexedStruct(prop, licensorPattern, licensor);
@override
List<Widget> buildFromExtractedData() => [
if (licensor.isNotEmpty)
XmpStructArrayCard(
title: 'Licensor',
structByIndex: licensor,
),
];
}