Skip to content

Commit 596d61a

Browse files
committed
fix update
1 parent 62d665f commit 596d61a

4 files changed

Lines changed: 15 additions & 16 deletions

File tree

lib/app.dart

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import 'package:dpip/utils/constants.dart';
1313
import 'package:dpip/utils/log.dart';
1414
import 'package:dynamic_color/dynamic_color.dart';
1515
import 'package:firebase_messaging/firebase_messaging.dart';
16+
import 'package:flutter/foundation.dart';
1617
import 'package:flutter/material.dart';
1718
import 'package:go_router/go_router.dart';
1819
import 'package:google_fonts/google_fonts.dart';
@@ -40,6 +41,8 @@ class _DpipAppState extends State<DpipApp> with WidgetsBindingObserver {
4041
bool _hasHandledInitialShortcut = false;
4142

4243
Future<void> _checkUpdate() async {
44+
if (kDebugMode) return;
45+
4346
try {
4447
if (Platform.isAndroid) {
4548
final info = await InAppUpdate.checkForUpdate();

lib/app/home/_widgets/location_button.dart

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,30 +53,30 @@ class LocationButton extends StatelessWidget {
5353
required Set<String> favorited,
5454
}) {
5555
final currentCode = temporaryCode ?? savedCode;
56+
final model = context.read<HomeLocationModel>();
5657

5758
showModalBottomSheet<String?>(
5859
context: context,
5960
constraints: context.bottomSheetConstraints,
6061
isScrollControlled: true,
61-
builder: (context) => _LocationMenuSheet(
62+
builder: (sheetContext) => _LocationMenuSheet(
6263
savedCode: savedCode,
6364
favorited: favorited,
6465
currentCode: currentCode,
6566
onLocationSelected: (code) {
66-
Navigator.of(context).pop();
67-
final model = context.read<HomeLocationModel>();
67+
Navigator.of(sheetContext).pop();
6868
if (code == savedCode) {
6969
model.setTemporaryCode(null);
7070
} else {
7171
model.setTemporaryCode(code);
7272
}
7373
},
7474
onAddLocationPressed: () {
75-
Navigator.of(context).pop();
75+
Navigator.of(sheetContext).pop();
7676
SettingsLocationSelectRoute().push(context);
7777
},
7878
onSettingsPressed: () {
79-
Navigator.of(context).pop();
79+
Navigator.of(sheetContext).pop();
8080
SettingsLocationRoute().push(context);
8181
},
8282
),

lib/app/home/layout.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ class HomeLayout extends StatelessWidget {
1111
Widget build(BuildContext context) {
1212
return Scaffold(
1313
body: ChangeNotifierProvider<HomeLocationModel>(
14-
create: (_) => HomeLocationModel(),
14+
create: (context) => HomeLocationModel(),
1515
child: child,
1616
),
1717
);

lib/app/home/page.dart

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ import 'package:dpip/utils/log.dart';
3636
import 'package:dpip/utils/shader_selector.dart';
3737
import 'package:dpip/utils/wallpaper_selector.dart';
3838
import 'package:dpip/widgets/responsive/responsive_container.dart';
39+
import 'package:flutter/foundation.dart';
3940
import 'package:flutter/material.dart';
4041
import 'package:go_router/go_router.dart';
4142
import 'package:i18n_extension/i18n_extension.dart';
@@ -49,15 +50,12 @@ import 'package:url_launcher/url_launcher.dart';
4950
class HomePage extends StatefulWidget {
5051
const HomePage({super.key});
5152

52-
static const route = '/home';
53-
5453
@override
5554
State<HomePage> createState() => _HomePageState();
5655
}
5756

5857
class _HomePageState extends State<HomePage> with WidgetsBindingObserver {
59-
DraggableScrollableController _sheetController =
60-
DraggableScrollableController();
58+
DraggableScrollableController _sheetController = .new();
6159

6260
Key _mapKey = UniqueKey();
6361
bool _isLoading = false;
@@ -85,7 +83,7 @@ class _HomePageState extends State<HomePage> with WidgetsBindingObserver {
8583
HomeLocationModel? _homeLocationModel;
8684

8785
History? get _thunderstorm => _realtimeRegion
88-
?.where((e) => e.type == HistoryType.thunderstorm)
86+
?.where((e) => e.type == .thunderstorm)
8987
.sorted((a, b) => b.time.send.compareTo(a.time.send))
9088
.firstOrNull;
9189

@@ -145,7 +143,7 @@ class _HomePageState extends State<HomePage> with WidgetsBindingObserver {
145143

146144
void _onSheetChanged() {
147145
final size = _sheetController.size;
148-
final screenHeight = MediaQuery.of(context).size.height;
146+
final screenHeight = context.dimension.height;
149147
final baseSize = (_firstCardHeight / screenHeight).clamp(0.25, 0.6);
150148
final progress = ((size - baseSize) / (1.0 - baseSize)).clamp(0.0, 1.0);
151149
final newBlur = (progress * 15.0 / 5.0).round() * 5.0;
@@ -183,7 +181,7 @@ class _HomePageState extends State<HomePage> with WidgetsBindingObserver {
183181

184182
@override
185183
void didChangeAppLifecycleState(AppLifecycleState state) {
186-
if (state == AppLifecycleState.resumed) _refresh();
184+
if (state == .resumed) _refresh();
187185
}
188186

189187
void _checkVersion() {
@@ -222,9 +220,7 @@ class _HomePageState extends State<HomePage> with WidgetsBindingObserver {
222220
final isOutOfService = _checkIfOutOfService(code);
223221

224222
if (isOutOfService && !_currentMode.isNational) {
225-
_currentMode = _currentMode.isActive
226-
? HomeMode.nationalActive
227-
: HomeMode.nationalHistory;
223+
_currentMode = _currentMode.isActive ? .nationalActive : .nationalHistory;
228224
}
229225

230226
setState(() {

0 commit comments

Comments
 (0)