|
@@ -1,24 +1,23 @@
|
|
import 'package:flutter/material.dart';
|
|
import 'package:flutter/material.dart';
|
|
import 'package:flutter_hooks/flutter_hooks.dart';
|
|
import 'package:flutter_hooks/flutter_hooks.dart';
|
|
import 'package:hooks_riverpod/hooks_riverpod.dart';
|
|
import 'package:hooks_riverpod/hooks_riverpod.dart';
|
|
|
|
+import 'package:immich_mobile/modules/home/ui/daily_title_text.dart';
|
|
import 'package:immich_mobile/modules/home/ui/draggable_scrollbar.dart';
|
|
import 'package:immich_mobile/modules/home/ui/draggable_scrollbar.dart';
|
|
import 'package:immich_mobile/modules/home/ui/image_grid.dart';
|
|
import 'package:immich_mobile/modules/home/ui/image_grid.dart';
|
|
import 'package:immich_mobile/modules/home/ui/immich_sliver_appbar.dart';
|
|
import 'package:immich_mobile/modules/home/ui/immich_sliver_appbar.dart';
|
|
|
|
+import 'package:immich_mobile/modules/home/ui/monthly_title_text.dart';
|
|
import 'package:immich_mobile/modules/home/ui/profile_drawer.dart';
|
|
import 'package:immich_mobile/modules/home/ui/profile_drawer.dart';
|
|
import 'package:immich_mobile/modules/home/models/get_all_asset_respose.model.dart';
|
|
import 'package:immich_mobile/modules/home/models/get_all_asset_respose.model.dart';
|
|
import 'package:immich_mobile/modules/home/providers/asset.provider.dart';
|
|
import 'package:immich_mobile/modules/home/providers/asset.provider.dart';
|
|
-import 'package:intl/intl.dart';
|
|
|
|
|
|
|
|
class HomePage extends HookConsumerWidget {
|
|
class HomePage extends HookConsumerWidget {
|
|
const HomePage({Key? key}) : super(key: key);
|
|
const HomePage({Key? key}) : super(key: key);
|
|
|
|
|
|
@override
|
|
@override
|
|
Widget build(BuildContext context, WidgetRef ref) {
|
|
Widget build(BuildContext context, WidgetRef ref) {
|
|
- final ValueNotifier<bool> _showBackToTopBtn = useState(false);
|
|
|
|
ScrollController _scrollController = useScrollController();
|
|
ScrollController _scrollController = useScrollController();
|
|
-
|
|
|
|
- List<ImmichAssetGroupByDate> assetGroup = ref.watch(assetProvider);
|
|
|
|
- List<Widget> imageGridGroup = [];
|
|
|
|
|
|
+ List<ImmichAssetGroupByDate> _assetGroup = ref.watch(assetProvider);
|
|
|
|
+ List<Widget> _imageGridGroup = [];
|
|
|
|
|
|
_scrollControllerCallback() {
|
|
_scrollControllerCallback() {
|
|
var endOfPage = _scrollController.position.maxScrollExtent;
|
|
var endOfPage = _scrollController.position.maxScrollExtent;
|
|
@@ -26,12 +25,6 @@ class HomePage extends HookConsumerWidget {
|
|
if (_scrollController.offset >= endOfPage - (endOfPage * 0.1) && !_scrollController.position.outOfRange) {
|
|
if (_scrollController.offset >= endOfPage - (endOfPage * 0.1) && !_scrollController.position.outOfRange) {
|
|
ref.read(assetProvider.notifier).getOlderAsset();
|
|
ref.read(assetProvider.notifier).getOlderAsset();
|
|
}
|
|
}
|
|
-
|
|
|
|
- if (_scrollController.offset >= 400) {
|
|
|
|
- _showBackToTopBtn.value = true;
|
|
|
|
- } else {
|
|
|
|
- _showBackToTopBtn.value = false;
|
|
|
|
- }
|
|
|
|
}
|
|
}
|
|
|
|
|
|
useEffect(() {
|
|
useEffect(() {
|
|
@@ -49,18 +42,18 @@ class HomePage extends HookConsumerWidget {
|
|
// Remove and force getting new widget again if there is not many widget on screen.
|
|
// Remove and force getting new widget again if there is not many widget on screen.
|
|
// Otherwise do nothing.
|
|
// Otherwise do nothing.
|
|
|
|
|
|
- if (imageGridGroup.isNotEmpty && imageGridGroup.length < 20) {
|
|
|
|
|
|
+ if (_imageGridGroup.isNotEmpty && _imageGridGroup.length < 20) {
|
|
ref.read(assetProvider.notifier).getOlderAsset();
|
|
ref.read(assetProvider.notifier).getOlderAsset();
|
|
- } else if (imageGridGroup.isEmpty) {
|
|
|
|
|
|
+ } else if (_imageGridGroup.isEmpty) {
|
|
ref.read(assetProvider.notifier).getImmichAssets();
|
|
ref.read(assetProvider.notifier).getImmichAssets();
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
Widget _buildBody() {
|
|
Widget _buildBody() {
|
|
- if (assetGroup.isNotEmpty) {
|
|
|
|
- String lastGroupDate = assetGroup[0].date;
|
|
|
|
|
|
+ if (_assetGroup.isNotEmpty) {
|
|
|
|
+ String lastGroupDate = _assetGroup[0].date;
|
|
|
|
|
|
- for (var group in assetGroup) {
|
|
|
|
|
|
+ for (var group in _assetGroup) {
|
|
var dateTitle = group.date;
|
|
var dateTitle = group.date;
|
|
var assetGroup = group.assets;
|
|
var assetGroup = group.assets;
|
|
|
|
|
|
@@ -71,19 +64,19 @@ class HomePage extends HookConsumerWidget {
|
|
|
|
|
|
if (currentMonth != null && previousMonth != null) {
|
|
if (currentMonth != null && previousMonth != null) {
|
|
if ((currentMonth - previousMonth) != 0) {
|
|
if ((currentMonth - previousMonth) != 0) {
|
|
- imageGridGroup.add(
|
|
|
|
|
|
+ _imageGridGroup.add(
|
|
MonthlyTitleText(isoDate: dateTitle),
|
|
MonthlyTitleText(isoDate: dateTitle),
|
|
);
|
|
);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
// Add Daily Title Group
|
|
// Add Daily Title Group
|
|
- imageGridGroup.add(
|
|
|
|
- DailyTitleText(isoDate: dateTitle),
|
|
|
|
|
|
+ _imageGridGroup.add(
|
|
|
|
+ DailyTitleText(isoDate: dateTitle, assetGroup: assetGroup),
|
|
);
|
|
);
|
|
|
|
|
|
// Add Image Group
|
|
// Add Image Group
|
|
- imageGridGroup.add(
|
|
|
|
|
|
+ _imageGridGroup.add(
|
|
ImageGrid(assetGroup: assetGroup),
|
|
ImageGrid(assetGroup: assetGroup),
|
|
);
|
|
);
|
|
//
|
|
//
|
|
@@ -100,10 +93,10 @@ class HomePage extends HookConsumerWidget {
|
|
controller: _scrollController,
|
|
controller: _scrollController,
|
|
slivers: [
|
|
slivers: [
|
|
ImmichSliverAppBar(
|
|
ImmichSliverAppBar(
|
|
- imageGridGroup: imageGridGroup,
|
|
|
|
|
|
+ imageGridGroup: _imageGridGroup,
|
|
onPopBack: onPopBackFromBackupPage,
|
|
onPopBack: onPopBackFromBackupPage,
|
|
),
|
|
),
|
|
- ...imageGridGroup,
|
|
|
|
|
|
+ ..._imageGridGroup,
|
|
],
|
|
],
|
|
),
|
|
),
|
|
),
|
|
),
|
|
@@ -116,69 +109,3 @@ class HomePage extends HookConsumerWidget {
|
|
);
|
|
);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
-
|
|
|
|
-class MonthlyTitleText extends StatelessWidget {
|
|
|
|
- const MonthlyTitleText({
|
|
|
|
- Key? key,
|
|
|
|
- required this.isoDate,
|
|
|
|
- }) : super(key: key);
|
|
|
|
-
|
|
|
|
- final String isoDate;
|
|
|
|
-
|
|
|
|
- @override
|
|
|
|
- Widget build(BuildContext context) {
|
|
|
|
- var monthTitleText = DateFormat('MMMM, y').format(DateTime.parse(isoDate));
|
|
|
|
-
|
|
|
|
- return SliverToBoxAdapter(
|
|
|
|
- child: Padding(
|
|
|
|
- padding: const EdgeInsets.only(left: 10.0, top: 32),
|
|
|
|
- child: Text(
|
|
|
|
- monthTitleText,
|
|
|
|
- style: TextStyle(
|
|
|
|
- fontSize: 24,
|
|
|
|
- fontWeight: FontWeight.bold,
|
|
|
|
- color: Theme.of(context).primaryColor,
|
|
|
|
- ),
|
|
|
|
- ),
|
|
|
|
- ),
|
|
|
|
- );
|
|
|
|
- }
|
|
|
|
-}
|
|
|
|
-
|
|
|
|
-class DailyTitleText extends StatelessWidget {
|
|
|
|
- const DailyTitleText({
|
|
|
|
- Key? key,
|
|
|
|
- required this.isoDate,
|
|
|
|
- }) : super(key: key);
|
|
|
|
-
|
|
|
|
- final String isoDate;
|
|
|
|
-
|
|
|
|
- @override
|
|
|
|
- Widget build(BuildContext context) {
|
|
|
|
- var currentYear = DateTime.now().year;
|
|
|
|
- var groupYear = DateTime.parse(isoDate).year;
|
|
|
|
- var formatDateTemplate = currentYear == groupYear ? 'E, MMM dd' : 'E, MMM dd, yyyy';
|
|
|
|
- var dateText = DateFormat(formatDateTemplate).format(DateTime.parse(isoDate));
|
|
|
|
-
|
|
|
|
- return SliverToBoxAdapter(
|
|
|
|
- child: Padding(
|
|
|
|
- padding: const EdgeInsets.only(top: 24.0, bottom: 24.0, left: 3.0),
|
|
|
|
- child: Row(
|
|
|
|
- children: [
|
|
|
|
- Padding(
|
|
|
|
- padding: const EdgeInsets.only(left: 8.0, bottom: 5.0, top: 5.0),
|
|
|
|
- child: Text(
|
|
|
|
- dateText,
|
|
|
|
- style: const TextStyle(
|
|
|
|
- fontSize: 14,
|
|
|
|
- fontWeight: FontWeight.bold,
|
|
|
|
- color: Colors.black87,
|
|
|
|
- ),
|
|
|
|
- ),
|
|
|
|
- ),
|
|
|
|
- ],
|
|
|
|
- ),
|
|
|
|
- ),
|
|
|
|
- );
|
|
|
|
- }
|
|
|
|
-}
|
|
|