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

refactor

Browse source
This commit is contained in:
Thibault Deckers 2023-03-25 11:01:36 +01:00
parent 86b982d270
commit f375361c13
16 changed files with 25 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/model/actions/slideshow.dart
View file

@ -1,6 +1,6 @@
import 'package:aves/theme/icons.dart';
import 'package:aves/widgets/common/extensions/build_context.dart';
import 'package:flutter/material.dart';
import 'package:flutter/widgets.dart';
enum SlideshowAction {
resume,

2
lib/model/entry/extensions/info.dart
View file

@ -13,7 +13,7 @@ import 'package:aves/theme/text.dart';
import 'package:aves/widgets/viewer/info/metadata/metadata_dir.dart';
import 'package:aves_model/aves_model.dart';
import 'package:collection/collection.dart';
import 'package:flutter/material.dart';
import 'package:flutter/widgets.dart';
import 'package:provider/provider.dart';
extension ExtraAvesEntryInfo on AvesEntry {

1
lib/model/filters/coordinate.dart
View file

@ -7,7 +7,6 @@ import 'package:aves/model/settings/settings.dart';
import 'package:aves/theme/icons.dart';
import 'package:aves/widgets/common/extensions/build_context.dart';
import 'package:aves_map/aves_map.dart';
import 'package:flutter/material.dart';
import 'package:flutter/widgets.dart';
import 'package:latlong2/latlong.dart';
import 'package:provider/provider.dart';

2
lib/model/filters/favourite.dart
View file

@ -5,7 +5,7 @@ import 'package:aves/theme/colors.dart';
import 'package:aves/theme/icons.dart';
import 'package:aves/widgets/common/extensions/build_context.dart';
import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
import 'package:flutter/widgets.dart';
import 'package:provider/provider.dart';
class FavouriteFilter extends CollectionFilter {

1
lib/model/filters/query.dart
View file

@ -4,7 +4,6 @@ import 'package:aves/theme/colors.dart';
import 'package:aves/theme/icons.dart';
import 'package:aves/utils/file_utils.dart';
import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
import 'package:flutter/widgets.dart';
import 'package:provider/provider.dart';

2
lib/model/filters/recent.dart
View file

@ -1,7 +1,7 @@
import 'package:aves/model/filters/filters.dart';
import 'package:aves/theme/icons.dart';
import 'package:aves/widgets/common/extensions/build_context.dart';
import 'package:flutter/material.dart';
import 'package:flutter/widgets.dart';
class RecentlyAddedFilter extends CollectionFilter {
static const type = 'recently_added';

2
lib/model/filters/trash.dart
View file

@ -2,7 +2,7 @@ import 'package:aves/model/entry/entry.dart';
import 'package:aves/model/filters/filters.dart';
import 'package:aves/theme/icons.dart';
import 'package:aves/widgets/common/extensions/build_context.dart';
import 'package:flutter/material.dart';
import 'package:flutter/widgets.dart';
class TrashFilter extends CollectionFilter {
static const type = 'trash';

5
lib/model/geotiff.dart
View file

@ -8,7 +8,8 @@ import 'package:aves/ref/geotiff.dart';
import 'package:aves/utils/math_utils.dart';
import 'package:aves_map/aves_map.dart';
import 'package:equatable/equatable.dart';
import 'package:flutter/material.dart';
import 'package:flutter/foundation.dart';
import 'package:flutter/painting.dart';
import 'package:latlong2/latlong.dart';
import 'package:proj4dart/proj4dart.dart' as proj4;
@ -49,7 +50,7 @@ class MappedGeoTiff with MapOverlay {
static final tileImagePaint = Paint();
static final tileMissingPaint = Paint()
..style = PaintingStyle.fill
..color = Colors.black;
..color = const Color(0xFF000000);
MappedGeoTiff({
required GeoTiffInfo info,

2
lib/model/naming_pattern.dart
View file

@ -1,6 +1,6 @@
import 'package:aves/model/entry/entry.dart';
import 'package:equatable/equatable.dart';
import 'package:flutter/material.dart';
import 'package:flutter/foundation.dart';
import 'package:intl/intl.dart';
@immutable

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

@ -1,3 +1,5 @@
import 'dart:ui';
import 'package:aves/model/actions/entry.dart';
import 'package:aves/model/actions/entry_set.dart';
import 'package:aves/model/filters/recent.dart';
@ -5,10 +7,10 @@ import 'package:aves/model/naming_pattern.dart';
import 'package:aves/model/settings/enums/enums.dart';
import 'package:aves/model/source/enums/enums.dart';
import 'package:aves/ref/mime_types.dart';
import 'package:aves/utils/colors.dart';
import 'package:aves/widgets/filter_grids/albums_page.dart';
import 'package:aves/widgets/filter_grids/countries_page.dart';
import 'package:aves/widgets/filter_grids/tags_page.dart';
import 'package:flutter/material.dart';
class SettingsDefaults {
// app
@ -104,8 +106,8 @@ class SettingsDefaults {
static const subtitleTextAlignment = TextAlign.center;
static const subtitleTextPosition = SubtitlePosition.bottom;
static const subtitleShowOutline = true;
static const subtitleTextColor = Colors.white;
static const subtitleBackgroundColor = Colors.transparent;
static const subtitleTextColor = Color(0xFFFFFFFF);
static const subtitleBackgroundColor = ColorUtils.transparentBlack;
// info
static const infoMapZoom = 12.0;

7
lib/model/settings/enums/entry_background.dart
View file

@ -1,5 +1,6 @@
import 'dart:ui';
import 'package:aves/model/settings/enums/enums.dart';
import 'package:flutter/material.dart';
extension ExtraEntryBackground on EntryBackground {
bool get isColor {
@ -15,10 +16,10 @@ extension ExtraEntryBackground on EntryBackground {
Color get color {
switch (this) {
case EntryBackground.white:
return Colors.white;
return const Color(0xFFFFFFFF);
case EntryBackground.black:
default:
return Colors.black;
return const Color(0xFF000000);
}
}
}

2
lib/model/settings/settings.dart
View file

@ -26,8 +26,8 @@ import 'package:aves_map/aves_map.dart';
import 'package:aves_utils/aves_utils.dart';
import 'package:collection/collection.dart';
import 'package:device_info_plus/device_info_plus.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:flutter/widgets.dart';
import 'package:latlong2/latlong.dart';
final Settings settings = Settings._private();

2
lib/model/source/media_store_source.dart
View file

@ -13,7 +13,7 @@ import 'package:aves/model/vaults/vaults.dart';
import 'package:aves/services/common/services.dart';
import 'package:aves/utils/android_file_utils.dart';
import 'package:collection/collection.dart';
import 'package:flutter/material.dart';
import 'package:flutter/foundation.dart';
class MediaStoreSource extends CollectionSource {
SourceInitializationState _initState = SourceInitializationState.none;

2
lib/model/wallpaper_target.dart
View file

@ -1,5 +1,5 @@
import 'package:aves/widgets/common/extensions/build_context.dart';
import 'package:flutter/material.dart';
import 'package:flutter/widgets.dart';
enum WallpaperTarget { home, lock, homeLock }

3
lib/services/metadata/svg_metadata_service.dart
View file

@ -1,10 +1,11 @@
import 'dart:convert';
import 'dart:ui';
import 'package:aves/model/entry/entry.dart';
import 'package:aves/services/common/services.dart';
import 'package:aves/utils/string_utils.dart';
import 'package:collection/collection.dart';
import 'package:flutter/material.dart';
import 'package:flutter/foundation.dart';
import 'package:xml/xml.dart';
class SvgMetadataService {

4
lib/theme/styles.dart
View file

@ -1,6 +1,6 @@
import 'dart:ui';
import 'package:flutter/material.dart';
import 'package:flutter/painting.dart';
class AStyles {
// as of Flutter v2.8.0, overflowing `Text` miscalculates height and some text (e.g. 'Å') is clipped
@ -22,7 +22,7 @@ class AStyles {
static const embossShadows = [
Shadow(
color: Colors.black,
color: Color(0xFF000000),
offset: Offset(0.5, 1.0),
)
];