mirror of
https://gitlab.com/nkming2/nc-photos.git
synced 2025-03-26 08:54:42 +01:00
Relocate code to related packages
This commit is contained in:
parent
901195442f
commit
8ccc50ac16
13 changed files with 47 additions and 51 deletions
|
@ -1,40 +0,0 @@
|
|||
extension DateTimeExtension on DateTime {
|
||||
DateTime copyWith({
|
||||
int? year,
|
||||
int? month,
|
||||
int? day,
|
||||
int? hour,
|
||||
int? minute,
|
||||
int? second,
|
||||
int? millisecond,
|
||||
int? microsecond,
|
||||
}) {
|
||||
if (isUtc) {
|
||||
return DateTime.utc(
|
||||
year ?? this.year,
|
||||
month ?? this.month,
|
||||
day ?? this.day,
|
||||
hour ?? this.hour,
|
||||
minute ?? this.minute,
|
||||
second ?? this.second,
|
||||
millisecond ?? this.millisecond,
|
||||
microsecond ?? this.microsecond,
|
||||
);
|
||||
} else {
|
||||
return DateTime(
|
||||
year ?? this.year,
|
||||
month ?? this.month,
|
||||
day ?? this.day,
|
||||
hour ?? this.hour,
|
||||
minute ?? this.minute,
|
||||
second ?? this.second,
|
||||
millisecond ?? this.millisecond,
|
||||
microsecond ?? this.microsecond,
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
/// Return a new object representing the midnight of the same day
|
||||
DateTime toMidnight() =>
|
||||
copyWith(hour: 0, minute: 0, second: 0, millisecond: 0, microsecond: 0);
|
||||
}
|
|
@ -46,7 +46,6 @@ import 'package:nc_photos/widget/album_share_outlier_browser.dart';
|
|||
import 'package:nc_photos/widget/collection_picker.dart';
|
||||
import 'package:nc_photos/widget/draggable_item_list.dart';
|
||||
import 'package:nc_photos/widget/export_collection_dialog.dart';
|
||||
import 'package:nc_photos/widget/fancy_option_picker.dart';
|
||||
import 'package:nc_photos/widget/file_sharer_dialog.dart';
|
||||
import 'package:nc_photos/widget/finger_listener.dart';
|
||||
import 'package:nc_photos/widget/network_thumbnail.dart';
|
||||
|
|
|
@ -33,7 +33,6 @@ import 'package:nc_photos/widget/archive_browser.dart';
|
|||
import 'package:nc_photos/widget/collection_browser.dart';
|
||||
import 'package:nc_photos/widget/collection_grid_item.dart';
|
||||
import 'package:nc_photos/widget/enhanced_photo_browser.dart';
|
||||
import 'package:nc_photos/widget/fancy_option_picker.dart';
|
||||
import 'package:nc_photos/widget/home_app_bar.dart';
|
||||
import 'package:nc_photos/widget/navigation_bar_blur_filter.dart';
|
||||
import 'package:nc_photos/widget/new_collection_dialog.dart';
|
||||
|
@ -43,6 +42,7 @@ import 'package:nc_photos/widget/selection_app_bar.dart';
|
|||
import 'package:nc_photos/widget/sharing_browser.dart';
|
||||
import 'package:nc_photos/widget/trashbin_browser.dart';
|
||||
import 'package:np_codegen/np_codegen.dart';
|
||||
import 'package:np_ui/np_ui.dart';
|
||||
import 'package:to_string/to_string.dart';
|
||||
|
||||
part 'home_collections.g.dart';
|
||||
|
|
|
@ -50,7 +50,6 @@ import 'package:nc_photos/widget/photo_list_item.dart';
|
|||
import 'package:nc_photos/widget/photo_list_util.dart' as photo_list_util;
|
||||
import 'package:nc_photos/widget/selectable_item_list.dart';
|
||||
import 'package:nc_photos/widget/selection_app_bar.dart';
|
||||
import 'package:nc_photos/widget/shimmer.dart';
|
||||
import 'package:nc_photos/widget/sliver_visualized_scale.dart';
|
||||
import 'package:nc_photos/widget/viewer.dart';
|
||||
import 'package:np_async/np_async.dart';
|
||||
|
@ -60,6 +59,7 @@ import 'package:np_common/object_util.dart';
|
|||
import 'package:np_common/or_null.dart';
|
||||
import 'package:np_datetime/np_datetime.dart';
|
||||
import 'package:np_db/np_db.dart';
|
||||
import 'package:np_ui/np_ui.dart';
|
||||
import 'package:to_string/to_string.dart';
|
||||
import 'package:visibility_detector/visibility_detector.dart';
|
||||
|
||||
|
|
|
@ -4,7 +4,6 @@ import 'package:clock/clock.dart';
|
|||
import 'package:collection/collection.dart';
|
||||
import 'package:logging/logging.dart';
|
||||
import 'package:nc_photos/account.dart';
|
||||
import 'package:nc_photos/date_time_extension.dart';
|
||||
import 'package:nc_photos/entity/collection.dart';
|
||||
import 'package:nc_photos/entity/collection/content_provider/memory.dart';
|
||||
import 'package:nc_photos/entity/file_descriptor.dart';
|
||||
|
|
|
@ -19,7 +19,6 @@ import 'package:nc_photos/help_utils.dart' as help_util;
|
|||
import 'package:nc_photos/k.dart' as k;
|
||||
import 'package:nc_photos/snack_bar_manager.dart';
|
||||
import 'package:nc_photos/url_launcher_util.dart';
|
||||
import 'package:nc_photos/widget/fancy_option_picker.dart';
|
||||
import 'package:nc_photos/widget/home.dart';
|
||||
import 'package:nc_photos/widget/page_visibility_mixin.dart';
|
||||
import 'package:nc_photos/widget/root_picker.dart';
|
||||
|
@ -27,6 +26,7 @@ import 'package:nc_photos/widget/settings/settings_list_caption.dart';
|
|||
import 'package:nc_photos/widget/share_folder_picker.dart';
|
||||
import 'package:nc_photos/widget/simple_input_dialog.dart';
|
||||
import 'package:np_codegen/np_codegen.dart';
|
||||
import 'package:np_ui/np_ui.dart';
|
||||
import 'package:to_string/to_string.dart';
|
||||
|
||||
part 'account/bloc.dart';
|
||||
|
|
|
@ -10,9 +10,9 @@ import 'package:nc_photos/exception_util.dart' as exception_util;
|
|||
import 'package:nc_photos/k.dart' as k;
|
||||
import 'package:nc_photos/language_util.dart' as language_util;
|
||||
import 'package:nc_photos/snack_bar_manager.dart';
|
||||
import 'package:nc_photos/widget/fancy_option_picker.dart';
|
||||
import 'package:nc_photos/widget/page_visibility_mixin.dart';
|
||||
import 'package:np_codegen/np_codegen.dart';
|
||||
import 'package:np_ui/np_ui.dart';
|
||||
import 'package:to_string/to_string.dart';
|
||||
|
||||
part 'language/bloc.dart';
|
||||
|
|
|
@ -10,7 +10,6 @@ import 'package:nc_photos/exception_util.dart' as exception_util;
|
|||
import 'package:nc_photos/gps_map_util.dart';
|
||||
import 'package:nc_photos/k.dart' as k;
|
||||
import 'package:nc_photos/snack_bar_manager.dart';
|
||||
import 'package:nc_photos/widget/fancy_option_picker.dart';
|
||||
import 'package:nc_photos/widget/page_visibility_mixin.dart';
|
||||
import 'package:np_codegen/np_codegen.dart';
|
||||
import 'package:np_gps_map/np_gps_map.dart';
|
||||
|
|
|
@ -1,4 +1,39 @@
|
|||
extension DateTimeExtension on DateTime {
|
||||
DateTime copyWith({
|
||||
int? year,
|
||||
int? month,
|
||||
int? day,
|
||||
int? hour,
|
||||
int? minute,
|
||||
int? second,
|
||||
int? millisecond,
|
||||
int? microsecond,
|
||||
}) {
|
||||
if (isUtc) {
|
||||
return DateTime.utc(
|
||||
year ?? this.year,
|
||||
month ?? this.month,
|
||||
day ?? this.day,
|
||||
hour ?? this.hour,
|
||||
minute ?? this.minute,
|
||||
second ?? this.second,
|
||||
millisecond ?? this.millisecond,
|
||||
microsecond ?? this.microsecond,
|
||||
);
|
||||
} else {
|
||||
return DateTime(
|
||||
year ?? this.year,
|
||||
month ?? this.month,
|
||||
day ?? this.day,
|
||||
hour ?? this.hour,
|
||||
minute ?? this.minute,
|
||||
second ?? this.second,
|
||||
millisecond ?? this.millisecond,
|
||||
microsecond ?? this.microsecond,
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
/// Returns true if [this] occurs before or at the same moment as [other].
|
||||
///
|
||||
/// The comparison is independent
|
||||
|
|
|
@ -4,7 +4,9 @@ export 'src/animated_visibility.dart';
|
|||
export 'src/app_bar_circular_progress_indicator.dart';
|
||||
export 'src/app_bar_title_container.dart';
|
||||
export 'src/asset_icon.dart';
|
||||
export 'src/fancy_option_picker.dart';
|
||||
export 'src/material3.dart';
|
||||
export 'src/shimmer.dart';
|
||||
export 'src/stateful_slider.dart';
|
||||
export 'src/switch_form_field.dart';
|
||||
export 'src/unbounded_list_tile.dart';
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
import 'package:flutter/material.dart';
|
||||
import 'package:nc_photos/object_extension.dart';
|
||||
import 'package:np_common/object_util.dart';
|
||||
|
||||
class FancyOptionPickerItem {
|
||||
const FancyOptionPickerItem({
|
||||
|
@ -22,10 +22,10 @@ class FancyOptionPickerItem {
|
|||
/// A fancy looking dialog to pick an option
|
||||
class FancyOptionPicker extends StatelessWidget {
|
||||
const FancyOptionPicker({
|
||||
Key? key,
|
||||
super.key,
|
||||
this.title,
|
||||
required this.items,
|
||||
}) : super(key: key);
|
||||
});
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
|
@ -76,7 +76,7 @@ class FancyOptionPickerItemView extends StatelessWidget {
|
|||
)
|
||||
: null,
|
||||
),
|
||||
subtitle: description?.run(Text.new),
|
||||
subtitle: description?.let(Text.new),
|
||||
onTap: isSelected ? onUnselect : onSelect,
|
||||
dense: dense,
|
||||
);
|
|
@ -10,6 +10,8 @@ environment:
|
|||
dependencies:
|
||||
flutter:
|
||||
sdk: flutter
|
||||
np_common:
|
||||
path: ../np_common
|
||||
|
||||
dev_dependencies:
|
||||
np_lints:
|
||||
|
|
Loading…
Add table
Reference in a new issue