mirror of
https://github.com/immich-app/immich.git
synced 2025-07-03 21:40:00 +02:00
fix(mobile): revert get location on app start (#17882)
This commit is contained in:
parent
d0014bdf94
commit
d85ef19bfc
1 changed files with 40 additions and 57 deletions
|
@ -1,7 +1,6 @@
|
||||||
import 'package:auto_route/auto_route.dart';
|
import 'package:auto_route/auto_route.dart';
|
||||||
import 'package:easy_localization/easy_localization.dart';
|
import 'package:easy_localization/easy_localization.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:geolocator/geolocator.dart';
|
|
||||||
import 'package:hooks_riverpod/hooks_riverpod.dart';
|
import 'package:hooks_riverpod/hooks_riverpod.dart';
|
||||||
import 'package:immich_mobile/domain/models/user.model.dart';
|
import 'package:immich_mobile/domain/models/user.model.dart';
|
||||||
import 'package:immich_mobile/extensions/asyncvalue_extensions.dart';
|
import 'package:immich_mobile/extensions/asyncvalue_extensions.dart';
|
||||||
|
@ -13,7 +12,6 @@ import 'package:immich_mobile/providers/server_info.provider.dart';
|
||||||
import 'package:immich_mobile/routing/router.dart';
|
import 'package:immich_mobile/routing/router.dart';
|
||||||
import 'package:immich_mobile/services/api.service.dart';
|
import 'package:immich_mobile/services/api.service.dart';
|
||||||
import 'package:immich_mobile/utils/image_url_builder.dart';
|
import 'package:immich_mobile/utils/image_url_builder.dart';
|
||||||
import 'package:immich_mobile/utils/map_utils.dart';
|
|
||||||
import 'package:immich_mobile/widgets/album/album_thumbnail_card.dart';
|
import 'package:immich_mobile/widgets/album/album_thumbnail_card.dart';
|
||||||
import 'package:immich_mobile/widgets/common/immich_app_bar.dart';
|
import 'package:immich_mobile/widgets/common/immich_app_bar.dart';
|
||||||
import 'package:immich_mobile/widgets/common/user_avatar.dart';
|
import 'package:immich_mobile/widgets/common/user_avatar.dart';
|
||||||
|
@ -357,66 +355,51 @@ class PlacesCollectionCard extends StatelessWidget {
|
||||||
final widthFactor = isTablet ? 0.25 : 0.5;
|
final widthFactor = isTablet ? 0.25 : 0.5;
|
||||||
final size = context.width * widthFactor - 20.0;
|
final size = context.width * widthFactor - 20.0;
|
||||||
|
|
||||||
return FutureBuilder<(Position?, LocationPermission?)>(
|
return GestureDetector(
|
||||||
future: MapUtils.checkPermAndGetLocation(
|
onTap: () => context.pushRoute(
|
||||||
context: context,
|
PlacesCollectionRoute(
|
||||||
silent: true,
|
currentLocation: null,
|
||||||
|
),
|
||||||
),
|
),
|
||||||
builder: (context, snapshot) {
|
child: Column(
|
||||||
var position = snapshot.data?.$1;
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
return GestureDetector(
|
children: [
|
||||||
onTap: () => context.pushRoute(
|
SizedBox(
|
||||||
PlacesCollectionRoute(
|
height: size,
|
||||||
currentLocation: position != null
|
width: size,
|
||||||
? LatLng(position.latitude, position.longitude)
|
child: DecoratedBox(
|
||||||
: null,
|
decoration: BoxDecoration(
|
||||||
|
borderRadius: const BorderRadius.all(Radius.circular(20)),
|
||||||
|
color:
|
||||||
|
context.colorScheme.secondaryContainer.withAlpha(100),
|
||||||
|
),
|
||||||
|
child: IgnorePointer(
|
||||||
|
child: MapThumbnail(
|
||||||
|
zoom: 8,
|
||||||
|
centre: const LatLng(
|
||||||
|
21.44950,
|
||||||
|
-157.91959,
|
||||||
|
),
|
||||||
|
showAttribution: false,
|
||||||
|
themeMode: context.isDarkTheme
|
||||||
|
? ThemeMode.dark
|
||||||
|
: ThemeMode.light,
|
||||||
|
),
|
||||||
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
child: Column(
|
Padding(
|
||||||
crossAxisAlignment: CrossAxisAlignment.start,
|
padding: const EdgeInsets.all(8.0),
|
||||||
children: [
|
child: Text(
|
||||||
SizedBox(
|
'places'.tr(),
|
||||||
height: size,
|
style: context.textTheme.titleSmall?.copyWith(
|
||||||
width: size,
|
color: context.colorScheme.onSurface,
|
||||||
child: DecoratedBox(
|
fontWeight: FontWeight.w500,
|
||||||
decoration: BoxDecoration(
|
|
||||||
borderRadius:
|
|
||||||
const BorderRadius.all(Radius.circular(20)),
|
|
||||||
color: context.colorScheme.secondaryContainer
|
|
||||||
.withAlpha(100),
|
|
||||||
),
|
|
||||||
child: IgnorePointer(
|
|
||||||
child: snapshot.connectionState ==
|
|
||||||
ConnectionState.waiting
|
|
||||||
? const Center(child: CircularProgressIndicator())
|
|
||||||
: MapThumbnail(
|
|
||||||
zoom: 8,
|
|
||||||
centre: LatLng(
|
|
||||||
position?.latitude ?? 21.44950,
|
|
||||||
position?.longitude ?? -157.91959,
|
|
||||||
),
|
|
||||||
showAttribution: false,
|
|
||||||
themeMode: context.isDarkTheme
|
|
||||||
? ThemeMode.dark
|
|
||||||
: ThemeMode.light,
|
|
||||||
),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
),
|
),
|
||||||
Padding(
|
),
|
||||||
padding: const EdgeInsets.all(8.0),
|
|
||||||
child: Text(
|
|
||||||
'places'.tr(),
|
|
||||||
style: context.textTheme.titleSmall?.copyWith(
|
|
||||||
color: context.colorScheme.onSurface,
|
|
||||||
fontWeight: FontWeight.w500,
|
|
||||||
),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
],
|
|
||||||
),
|
),
|
||||||
);
|
],
|
||||||
},
|
),
|
||||||
);
|
);
|
||||||
},
|
},
|
||||||
);
|
);
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue