Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improvement #80

Merged
merged 4 commits into from
Dec 20, 2024
Merged

Improvement #80

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8e082b8
Use google apis for list
cp-pratik-k Dec 20, 2024
af334ce
Use google apis for list
cp-pratik-k Dec 20, 2024
ba0b822
Fix preview
cp-pratik-k Dec 20, 2024
102e89b
Fix preview
cp-pratik-k Dec 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 0 additions & 16 deletions .idea/libraries/Dart_Packages.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

38 changes: 19 additions & 19 deletions .idea/libraries/Flutter_Plugins.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

181 changes: 88 additions & 93 deletions app/lib/ui/flow/home/home_screen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,108 +122,103 @@ class _HomeScreenState extends ConsumerState<HomeScreen> {
),
);

return Scrollbar(
return ListView.builder(
controller: _scrollController,
interactive: true,
child: ListView.builder(
controller: _scrollController,
itemCount: state.medias.length + 2,
itemBuilder: (context, index) {
if (index == 0) {
return Column(
children: [
const HomeScreenHints(),
const NoInternetConnectionHint(),
],
);
} else if (index == state.medias.length + 1) {
return FadeInSwitcher(
child: state.loading
? const Center(
child: Padding(
padding: EdgeInsets.all(16),
child: AppCircularProgressIndicator(
size: 20,
),
itemCount: state.medias.length + 2,
itemBuilder: (context, index) {
if (index == 0) {
return Column(
children: [
const HomeScreenHints(),
const NoInternetConnectionHint(),
],
);
} else if (index == state.medias.length + 1) {
return FadeInSwitcher(
child: state.loading
? const Center(
child: Padding(
padding: EdgeInsets.all(16),
child: AppCircularProgressIndicator(
size: 20,
),
)
: const SizedBox(),
);
} else {
final gridEntry = state.medias.entries.elementAt(index - 1);
return Column(
children: [
Container(
height: 45,
padding: const EdgeInsets.only(left: 16, top: 5),
margin: EdgeInsets.zero,
alignment: Alignment.centerLeft,
decoration: BoxDecoration(
color: context.colorScheme.surface,
),
child: Text(
gridEntry.key.format(context, DateFormatType.relative),
style: AppTextStyles.subtitle1.copyWith(
color: context.colorScheme.textPrimary,
),
),
)
: const SizedBox(),
);
} else {
final gridEntry = state.medias.entries.elementAt(index - 1);
return Column(
children: [
Container(
height: 45,
padding: const EdgeInsets.only(left: 16, top: 5),
margin: EdgeInsets.zero,
alignment: Alignment.centerLeft,
decoration: BoxDecoration(
color: context.colorScheme.surface,
),
GridView.builder(
padding: const EdgeInsets.all(4),
physics: const NeverScrollableScrollPhysics(),
shrinkWrap: true,
gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
crossAxisCount: context.mediaQuerySize.width > 600
? context.mediaQuerySize.width ~/ 180
: context.mediaQuerySize.width ~/ 100,
crossAxisSpacing: 4,
mainAxisSpacing: 4,
child: Text(
gridEntry.key.format(context, DateFormatType.relative),
style: AppTextStyles.subtitle1.copyWith(
color: context.colorScheme.textPrimary,
),
itemCount: gridEntry.value.entries.length,
itemBuilder: (context, index) {
final media =
gridEntry.value.entries.elementAt(index).value;
),
),
GridView.builder(
padding: const EdgeInsets.all(4),
physics: const NeverScrollableScrollPhysics(),
shrinkWrap: true,
gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
crossAxisCount: context.mediaQuerySize.width > 600
? context.mediaQuerySize.width ~/ 180
: context.mediaQuerySize.width ~/ 100,
crossAxisSpacing: 4,
mainAxisSpacing: 4,
),
itemCount: gridEntry.value.entries.length,
itemBuilder: (context, index) {
final media = gridEntry.value.entries.elementAt(index).value;

if (media.id == state.lastLocalMediaId) {
runPostFrame(() {
_notifier.loadMedias();
});
}
if (media.id == state.lastLocalMediaId) {
runPostFrame(() {
_notifier.loadMedias();
});
}

return AppMediaItem(
key: ValueKey(media.id),
onTap: () async {
if (state.selectedMedias.isNotEmpty) {
_notifier.toggleMediaSelection(media);
HapticFeedback.lightImpact();
} else {
await MediaPreviewRoute(
$extra: MediaPreviewRouteData(
medias: state.medias.values
.expand((element) => element.values)
.toList(),
startFrom: media.id,
),
).push(context);
}
},
onLongTap: () {
return AppMediaItem(
key: ValueKey(media.id),
onTap: () async {
if (state.selectedMedias.isNotEmpty) {
_notifier.toggleMediaSelection(media);
HapticFeedback.lightImpact();
},
isSelected: state.selectedMedias.containsKey(media.id),
uploadMediaProcess: state.uploadMediaProcesses[media.id],
downloadMediaProcess:
state.downloadMediaProcesses[media.id],
media: media,
);
},
),
],
);
}
},
),
} else {
await MediaPreviewRoute(
$extra: MediaPreviewRouteData(
medias: state.medias.values
.expand((element) => element.values)
.toList(),
startFrom: media.id,
),
).push(context);
}
},
onLongTap: () {
_notifier.toggleMediaSelection(media);
HapticFeedback.lightImpact();
},
isSelected: state.selectedMedias.containsKey(media.id),
uploadMediaProcess: state.uploadMediaProcesses[media.id],
downloadMediaProcess:
state.downloadMediaProcesses[media.id],
media: media,
);
},
),
],
);
}
},
);
}
}
Expand Down
Loading
Loading