diff --git a/lib/main.dart b/lib/main.dart index 0c91405a..231bd664 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -20,7 +20,6 @@ final InAppLocalhostServer localhostServer = InAppLocalhostServer(port: 8686, documentRoot: 'assets/www', directoryIndex: 'home.html'); late bool safeNavi; late int selectedIndex; -late bool showControls; late DeviceType deviceType; late ObjectBox objectbox; @@ -79,5 +78,4 @@ Future init() async { safeNavi = false; selectedIndex = 0; - showControls = true; } diff --git a/lib/pages/home.dart b/lib/pages/home.dart index 553d3ca7..1daf2084 100644 --- a/lib/pages/home.dart +++ b/lib/pages/home.dart @@ -1,6 +1,5 @@ import 'dart:async'; import 'dart:developer'; -import 'dart:io'; import 'package:circular_menu/circular_menu.dart'; import 'package:conning_tower/constants.dart'; @@ -15,7 +14,6 @@ import 'package:conning_tower/pages/tasks_sheet.dart'; import 'package:conning_tower/pages/webview.dart'; import 'package:conning_tower/providers/alert_provider.dart'; import 'package:conning_tower/providers/generatable/device_provider.dart'; -import 'package:conning_tower/providers/generatable/kancolle_localization_provider.dart'; import 'package:conning_tower/providers/generatable/kcwiki_data_provider.dart'; import 'package:conning_tower/providers/generatable/settings_provider.dart'; import 'package:conning_tower/providers/generatable/webview_provider.dart'; @@ -28,7 +26,6 @@ import 'package:conning_tower/widgets/indexed_stack.dart'; import 'package:conning_tower/widgets/modal_sheets.dart'; import 'package:conning_tower/widgets/sidebar.dart'; import 'package:conning_tower/widgets/texts.dart'; -import 'package:firebase_crashlytics/firebase_crashlytics.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; @@ -51,6 +48,7 @@ class HomePage extends ConsumerStatefulWidget { class HomePageState extends ConsumerState { late Alignment fabAlignment; + late bool showControls; bool showNewVersion = false; bool setUp = true; PackageInfo _packageInfo = PackageInfo( @@ -65,7 +63,8 @@ class HomePageState extends ConsumerState { @override void initState() { super.initState(); - + + showControls = true; _initPackageInfo(); @@ -76,6 +75,9 @@ class HomePageState extends ConsumerState { ShakeDetector detector = ShakeDetector.autoStart( onPhoneShake: () { + if (!showControls) { + return; + } setState(() { showControls = true; }); diff --git a/pubspec.lock b/pubspec.lock index 7f25071e..bdd9a774 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -1166,10 +1166,10 @@ packages: dependency: transitive description: name: sensors_plus - sha256: "362c8f4f001838b90dd5206b898bbad941bc0142479eab9a3415f0f79e622908" + sha256: a1e461f28a8e8d3f81feb07d5c4e87e948379ea91f0b5131266bb79f72b38acb url: "https://pub.dev" source: hosted - version: "1.4.1" + version: "3.1.0" sensors_plus_platform_interface: dependency: transitive description: @@ -1178,21 +1178,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.2.0" - sensors_plus_web: - dependency: transitive - description: - name: sensors_plus_web - sha256: fca8d7d9ab6233b2a059952666415508e252420be1ef54f092d07884da53ec5e - url: "https://pub.dev" - source: hosted - version: "1.1.2" shake: dependency: "direct main" description: - name: shake - sha256: "107546951c6b8f5e4c2dca66dfb3aa27dd1a853b4e9a26c9aea224b167045023" - url: "https://pub.dev" - source: hosted + path: "." + ref: dev + resolved-ref: d51dcc52e9288536e234e62b6b658752fb0a2266 + url: "https://github.com/andychucs/shake.git" + source: git version: "2.2.0" share_plus: dependency: "direct main" diff --git a/pubspec.yaml b/pubspec.yaml index 754512af..14ef1f53 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -68,7 +68,10 @@ dependencies: popover: ^0.3.0+1 photo_manager: ^3.2.3 share_plus: ^10.0.2 - shake: ^2.2.0 + shake: + git: + url: https://github.com/andychucs/shake.git + ref: dev flutter_staggered_grid_view: ^0.7.0 percent_indicator: ^4.2.3 carousel_slider: ^5.0.0