immich-app/immich
1
0
Fork 0
mirror of https://github.com/immich-app/immich.git synced 2025-12-21 17:25:35 +03:00
Code Issues Packages Projects Releases 18 Wiki Activity

refactor(mobile): refactor to use context helpers for consistency (#14235)

Browse Source 
refactor to use context helpers for consistency

Co-authored-by: dvbthien <dvbthien@gmail.com>
This commit is contained in:
dvbthien
2024-11-21 22:35:58 +07:00
committed by GitHub
parent 45ba0cc3ac
commit e8da6604c9
28 changed files with 66 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mobile/lib/pages/common/album_viewer.page.dart
View File

@@ -243,7 +243,7 @@ class AlbumViewerPage extends HookConsumerWidget {
AnimatedPositioned(
duration: const Duration(milliseconds: 300),
top: ref.watch(multiselectProvider)
? -(kToolbarHeight + MediaQuery.of(context).padding.top)
? -(kToolbarHeight + context.padding.top)
: 0,
left: 0,
right: 0,

2
mobile/lib/pages/common/app_log_detail.page.dart
View File

@@ -37,7 +37,7 @@ class AppLogDetailPage extends HookConsumerWidget {
IconButton(
onPressed: () {
Clipboard.setData(ClipboardData(text: text)).then((_) {
ScaffoldMessenger.of(context).showSnackBar(
context.scaffoldMessenger.showSnackBar(
SnackBar(
content: Text(
"Copied to clipboard",

2
mobile/lib/pages/common/download_panel.dart
View File

@@ -97,7 +97,7 @@ class DownloadTaskTile extends StatelessWidget {
return SizedBox(
key: const ValueKey('download_progress'),
width: MediaQuery.of(context).size.width - 32,
width: context.width - 32,
child: Card(
clipBehavior: Clip.antiAlias,
shape: RoundedRectangleBorder(

2
mobile/lib/pages/common/gallery_viewer.page.dart
View File

@@ -141,7 +141,7 @@ class GalleryViewerPage extends HookConsumerWidget {
heightFactor: 0.75,
child: Padding(
padding: EdgeInsets.only(
bottom: MediaQuery.viewInsetsOf(context).bottom,
bottom: context.viewInsets.bottom,
),
child: ref
.watch(appSettingsServiceProvider)

3
mobile/lib/pages/common/large_leading_tile.dart
View File

@@ -1,4 +1,5 @@
import 'package:flutter/material.dart';
import 'package:immich_mobile/extensions/build_context_extensions.dart';
class LargeLeadingTile extends StatelessWidget {
const LargeLeadingTile({
@@ -37,7 +38,7 @@ class LargeLeadingTile extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.start,
children: [
SizedBox(
width: MediaQuery.of(context).size.width * 0.6,
width: context.width * 0.6,
child: title,
),
subtitle ?? const SizedBox.shrink(),

7
mobile/lib/pages/common/video_viewer.page.dart
View File

@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
import 'package:flutter_hooks/flutter_hooks.dart';
import 'package:hooks_riverpod/hooks_riverpod.dart';
import 'package:immich_mobile/entities/asset.entity.dart';
import 'package:immich_mobile/extensions/build_context_extensions.dart';
import 'package:immich_mobile/providers/asset_viewer/show_controls.provider.dart';
import 'package:immich_mobile/providers/asset_viewer/video_player_controller_provider.dart';
import 'package:immich_mobile/providers/asset_viewer/video_player_controls_provider.dart';
@@ -120,8 +121,6 @@ class VideoViewerPage extends HookConsumerWidget {
[controller],
);
final size = MediaQuery.sizeOf(context);
return PopScope(
onPopInvokedWithResult: (didPop, _) {
ref.read(videoPlaybackValueProvider.notifier).value =
@@ -148,8 +147,8 @@ class VideoViewerPage extends HookConsumerWidget {
),
if (controller != null)
SizedBox(
height: size.height,
width: size.width,
height: context.height,
width: context.width,
child: VideoPlayerViewer(
controller: controller,
isMotionVideo: isMotionVideo,

6
mobile/lib/pages/editing/crop.page.dart
View File

@@ -92,7 +92,7 @@ class CropImagePage extends HookWidget {
IconButton(
icon: Icon(
Icons.rotate_left,
color: Theme.of(context).iconTheme.color,
color: context.themeData.iconTheme.color,
),
onPressed: () {
cropController.rotateLeft();
@@ -101,7 +101,7 @@ class CropImagePage extends HookWidget {
IconButton(
icon: Icon(
Icons.rotate_right,
color: Theme.of(context).iconTheme.color,
color: context.themeData.iconTheme.color,
),
onPressed: () {
cropController.rotateRight();
@@ -203,7 +203,7 @@ class _AspectRatioButton extends StatelessWidget {
iconData,
color: aspectRatio.value == ratio
? context.primaryColor
: Theme.of(context).iconTheme.color,
: context.themeData.iconTheme.color,
),
onPressed: () {
cropController.crop = const Rect.fromLTRB(0.1, 0.1, 0.9, 0.9);

13
mobile/lib/pages/editing/edit.page.dart
View File

@@ -70,7 +70,7 @@ class EditImagePage extends ConsumerWidget {
title: "${p.withoutExtension(asset.fileName)}_edited.jpg",
);
await ref.read(albumProvider.notifier).refreshDeviceAlbums();
Navigator.of(context).popUntil((route) => route.isFirst);
context.navigator.popUntil((route) => route.isFirst);
ImmichToast.show(
durationInSecond: 3,
context: context,
@@ -99,8 +99,7 @@ class EditImagePage extends ConsumerWidget {
color: context.primaryColor,
size: 24,
),
onPressed: () =>
Navigator.of(context).popUntil((route) => route.isFirst),
onPressed: () => context.navigator.popUntil((route) => route.isFirst),
),
actions: <Widget>[
TextButton(
@@ -120,8 +119,8 @@ class EditImagePage extends ConsumerWidget {
body: Center(
child: ConstrainedBox(
constraints: BoxConstraints(
maxHeight: MediaQuery.of(context).size.height * 0.7,
maxWidth: MediaQuery.of(context).size.width * 0.9,
maxHeight: context.height * 0.7,
maxWidth: context.width * 0.9,
),
child: Container(
decoration: BoxDecoration(
@@ -161,7 +160,7 @@ class EditImagePage extends ConsumerWidget {
IconButton(
icon: Icon(
Icons.crop_rotate_rounded,
color: Theme.of(context).iconTheme.color,
color: context.themeData.iconTheme.color,
size: 25,
),
onPressed: () {
@@ -179,7 +178,7 @@ class EditImagePage extends ConsumerWidget {
IconButton(
icon: Icon(
Icons.filter,
color: Theme.of(context).iconTheme.color,
color: context.themeData.iconTheme.color,
size: 25,
),
onPressed: () {

4
mobile/lib/pages/editing/filter.page.dart
View File

@@ -104,7 +104,7 @@ class FilterImagePage extends HookWidget {
body: Column(
children: [
SizedBox(
height: MediaQuery.of(context).size.height * 0.7,
height: context.height * 0.7,
child: Center(
child: ColorFiltered(
colorFilter: colorFilter.value,
@@ -180,7 +180,7 @@ class _FilterButton extends StatelessWidget {
),
),
const SizedBox(height: 10),
Text(label, style: Theme.of(context).textTheme.bodyMedium),
Text(label, style: context.themeData.textTheme.bodyMedium),
],
);
}

6
mobile/lib/pages/library/library.page.dart
View File

@@ -202,7 +202,7 @@ class PeopleCollectionCard extends ConsumerWidget {
builder: (context, constraints) {
final isTablet = constraints.maxWidth > 600;
final widthFactor = isTablet ? 0.25 : 0.5;
final size = MediaQuery.of(context).size.width * widthFactor - 20.0;
final size = context.width * widthFactor - 20.0;
return GestureDetector(
onTap: () => context.pushRoute(const PeopleCollectionRoute()),
@@ -272,7 +272,7 @@ class LocalAlbumsCollectionCard extends HookConsumerWidget {
builder: (context, constraints) {
final isTablet = constraints.maxWidth > 600;
final widthFactor = isTablet ? 0.25 : 0.5;
final size = MediaQuery.of(context).size.width * widthFactor - 20.0;
final size = context.width * widthFactor - 20.0;
return GestureDetector(
onTap: () => context.pushRoute(
@@ -335,7 +335,7 @@ class PlacesCollectionCard extends StatelessWidget {
builder: (context, constraints) {
final isTablet = constraints.maxWidth > 600;
final widthFactor = isTablet ? 0.25 : 0.5;
final size = MediaQuery.of(context).size.width * widthFactor - 20.0;
final size = context.width * widthFactor - 20.0;
return GestureDetector(
onTap: () => context.pushRoute(const PlacesCollectionRoute()),

3
mobile/lib/pages/library/people/people_collection.page.dart
View File

@@ -32,8 +32,7 @@ class PeopleCollectionPage extends HookConsumerWidget {
return LayoutBuilder(
builder: (context, constraints) {
final isTablet = constraints.maxWidth > 600;
final isPortrait =
MediaQuery.of(context).orientation == Orientation.portrait;
final isPortrait = context.orientation == Orientation.portrait;
return Scaffold(
appBar: AppBar(

2
mobile/lib/pages/library/shared_link/shared_link_edit.page.dart
View File

@@ -279,7 +279,7 @@ class SharedLinkEditPage extends HookConsumerWidget {
void copyLinkToClipboard() {
Clipboard.setData(ClipboardData(text: newShareLink.value)).then((_) {
ScaffoldMessenger.of(context).showSnackBar(
context.scaffoldMessenger.showSnackBar(
SnackBar(
content: Text(
"shared_link_clipboard_copied_massage",

4
mobile/lib/pages/photos/photos.page.dart
View File

@@ -110,12 +110,12 @@ class PhotosPage extends HookConsumerWidget {
AnimatedPositioned(
duration: const Duration(milliseconds: 300),
top: ref.watch(multiselectProvider)
? -(kToolbarHeight + MediaQuery.of(context).padding.top)
? -(kToolbarHeight + context.padding.top)
: 0,
left: 0,
right: 0,
child: Container(
height: kToolbarHeight + MediaQuery.of(context).padding.top,
height: kToolbarHeight + context.padding.top,
color: context.themeData.appBarTheme.backgroundColor,
child: const ImmichAppBar(),
),

2
mobile/lib/pages/search/map/map.page.dart
View File

@@ -305,7 +305,7 @@ class MapPage extends HookConsumerWidget {
),
Positioned(
right: 0,
bottom: MediaQuery.paddingOf(context).bottom + 16,
bottom: context.padding.bottom + 16,
child: ElevatedButton(
onPressed: onZoomToLocation,
style: ElevatedButton.styleFrom(

2
mobile/lib/pages/search/search.page.dart
View File

@@ -196,7 +196,7 @@ class SearchPage extends HookConsumerWidget {
padding: const EdgeInsets.symmetric(vertical: 16.0),
child: Container(
padding: EdgeInsets.only(
bottom: MediaQuery.of(context).viewInsets.bottom,
bottom: context.viewInsets.bottom,
),
child: Padding(
padding: const EdgeInsets.symmetric(horizontal: 16.0),