code cleanup

khoren93 · Aug 20, 2023 · 5455b86 · 5455b86
1 parent edcd52f
commit 5455b86
Show file tree

Hide file tree

Showing 8 changed files with 136 additions and 135 deletions.
diff --git a/analysis_options.yaml b/analysis_options.yaml
@@ -105,14 +105,12 @@ linter:
  - hash_and_equals
  - implementation_imports
  # - invariant_booleans # too many false positives: https://github.com/dart-lang/linter/issues/811
- - iterable_contains_unrelated_type
  # - join_return_with_assignment # not required by flutter style
  - leading_newlines_in_multiline_strings
  - library_names
  - library_prefixes
  - library_private_types_in_public_api
  # - lines_longer_than_80_chars # not required by flutter style
- - list_remove_unrelated_type
  # - literal_only_boolean_expressions # too many false positives: https://github.com/dart-lang/linter/issues/453
  - missing_whitespace_between_adjacent_strings
  - no_adjacent_strings_in_list

diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock
@@ -31,4 +31,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: ef19549a9bc3046e7bb7d2fab4d021637c0c58a3
 
-COCOAPODS: 1.12.0
+COCOAPODS: 1.12.1
diff --git a/example/ios/Runner.xcodeproj/project.pbxproj b/example/ios/Runner.xcodeproj/project.pbxproj
@@ -155,7 +155,7 @@
  97C146E61CF9000F007C117D /* Project object */ = {
  isa = PBXProject;
  attributes = {
- LastUpgradeCheck = 1300;
+ LastUpgradeCheck = 1430;
  ORGANIZATIONNAME = "";
  TargetAttributes = {
  97C146ED1CF9000F007C117D = {

diff --git a/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
- LastUpgradeVersion = "1300"
+ LastUpgradeVersion = "1430"
  version = "1.3">
  <BuildAction
  parallelizeBuildables = "YES"

diff --git a/example/pubspec.lock b/example/pubspec.lock
@@ -29,26 +29,26 @@ packages:
  dependency: transitive
  description:
  name: camera
- sha256: ebebead3d5ec3d148249331d751d462d7e8c98102b8830a9b45ec96a2bd4333f
+ sha256: b4cede7c66f44fa476272d21bfe143d5f32e75de1ea56f737e3eaf982da23bab
  url: "https://pub.dev"
  source: hosted
- version: "0.10.5+2"
+ version: "0.10.5+3"
  camera_android:
  dependency: transitive
  description:
  name: camera_android
- sha256: f83e406d34f5faa80bf0f5c3beee4b4c11da94a94e9621c1bb8e312988621b4b
+ sha256: "61d62676708f187fb89fb14b371f87470343ba3cb26d08fc358e4f8a18e13150"
  url: "https://pub.dev"
  source: hosted
- version: "0.10.8+2"
+ version: "0.10.8+6"
  camera_avfoundation:
  dependency: transitive
  description:
  name: camera_avfoundation
- sha256: "1a416e452b30955b392f4efbf23291d3f2ba3660a85e1628859eb62d2a2bab26"
+ sha256: "332747f20cf911980e38c8442108102d4456752711781108fda237635baf362c"
  url: "https://pub.dev"
  source: hosted
- version: "0.9.13+2"
+ version: "0.9.13+3"
  camera_platform_interface:
  dependency: transitive
  description:
@@ -61,10 +61,10 @@ packages:
  dependency: transitive
  description:
  name: camera_web
- sha256: bcbd775fb3a9d51cc3ece899d54ad66f6306410556bac5759f78e13f9228841f
+ sha256: "894df2a4e9ddd77ffecee9553d5980eeabb8bf09d98e53934859e67dc367933b"
  url: "https://pub.dev"
  source: hosted
- version: "0.3.1+4"
+ version: "0.3.2+1"
  characters:
  dependency: transitive
  description:
@@ -85,10 +85,10 @@ packages:
  dependency: transitive
  description:
  name: collection
- sha256: "4a07be6cb69c84d677a6c3096fcf960cc3285a8330b4603e0d463d15d9bd934c"
+ sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687
  url: "https://pub.dev"
  source: hosted
- version: "1.17.1"
+ version: "1.17.2"
  convert:
  dependency: transitive
  description:
@@ -125,10 +125,10 @@ packages:
  dependency: transitive
  description:
  name: ffi
- sha256: ed5337a5660c506388a9f012be0288fb38b49020ce2b45fe1f8b8323fe429f99
+ sha256: "7bf0adc28a23d395f19f3f1eb21dd7cfd1dd9f8e1c50051c069122e6853bc878"
  url: "https://pub.dev"
  source: hosted
- version: "2.0.2"
+ version: "2.1.0"
  file_selector_linux:
  dependency: transitive
  description:
@@ -141,10 +141,10 @@ packages:
  dependency: transitive
  description:
  name: file_selector_macos
- sha256: "7a6f1ae6107265664f3f7f89a66074882c4d506aef1441c9af313c1f7e6f41ce"
+ sha256: "4ada532862917bf16e3adb3891fe3a5917a58bae03293e497082203a80909412"
  url: "https://pub.dev"
  source: hosted
- version: "0.9.3"
+ version: "0.9.3+1"
  file_selector_platform_interface:
  dependency: transitive
  description:
@@ -198,7 +198,7 @@ packages:
  path: ".."
  relative: true
  source: path
- version: "1.2.0"
+ version: "1.2.1"
  http:
  dependency: transitive
  description:
@@ -227,26 +227,26 @@ packages:
  dependency: transitive
  description:
  name: image_picker
- sha256: b9603755b35253ccfad4be0762bb74d5e8bf9ff75edebf0ac3beec24fac1c5b5
+ sha256: "841837258e0b42c80946c43443054fc726f5e8aa84a97f363eb9ef0d45b33c14"
  url: "https://pub.dev"
  source: hosted
- version: "1.0.0"
+ version: "1.0.2"
  image_picker_android:
  dependency: transitive
  description:
  name: image_picker_android
- sha256: d2bab152deb2547ea6f53d82ebca9b7e77386bb706e5789e815d37e08ea475bb
+ sha256: "8179b54039b50eee561676232304f487602e2950ffb3e8995ed9034d6505ca34"
  url: "https://pub.dev"
  source: hosted
- version: "0.8.7+3"
+ version: "0.8.7+4"
  image_picker_for_web:
  dependency: transitive
  description:
  name: image_picker_for_web
- sha256: "869fe8a64771b7afbc99fc433a5f7be2fea4d1cb3d7c11a48b6b579eb9c797f0"
+ sha256: "8b6c160cdbe572199103a091c783685b236110e4a0fd7a4947f32ff5b7da8765"
  url: "https://pub.dev"
  source: hosted
- version: "2.2.0"
+ version: "3.0.0"
  image_picker_ios:
  dependency: transitive
  description:
@@ -275,10 +275,10 @@ packages:
  dependency: transitive
  description:
  name: image_picker_platform_interface
- sha256: "7c7b96bb9413a9c28229e717e6fd1e3edd1cc5569c1778fcca060ecf729b65ee"
+ sha256: c1134543ae2187e85299996d21c526b2f403854994026d575ae4cf30d7bb2a32
  url: "https://pub.dev"
  source: hosted
- version: "2.8.0"
+ version: "2.9.0"
  image_picker_windows:
  dependency: transitive
  description:
@@ -307,18 +307,18 @@ packages:
  dependency: transitive
  description:
  name: matcher
- sha256: "6501fbd55da300384b768785b83e5ce66991266cec21af89ab9ae7f5ce1c4cbb"
+ sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e"
  url: "https://pub.dev"
  source: hosted
- version: "0.12.15"
+ version: "0.12.16"
  material_color_utilities:
  dependency: transitive
  description:
  name: material_color_utilities
- sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724
+ sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41"
  url: "https://pub.dev"
  source: hosted
- version: "0.2.0"
+ version: "0.5.0"
  meta:
  dependency: transitive
  description:
@@ -355,10 +355,10 @@ packages:
  dependency: transitive
  description:
  name: plugin_platform_interface
- sha256: "6a2128648c854906c53fa8e33986fc0247a1116122f9534dd20e3ab9e16a32bc"
+ sha256: "43798d895c929056255600343db8f049921cbec94d31ec87f1dc5c16c01935dd"
  url: "https://pub.dev"
  source: hosted
- version: "2.1.4"
+ version: "2.1.5"
  pointycastle:
  dependency: transitive
  description:
@@ -384,10 +384,10 @@ packages:
  dependency: transitive
  description:
  name: source_span
- sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250
+ sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c"
  url: "https://pub.dev"
  source: hosted
- version: "1.9.1"
+ version: "1.10.0"
  stack_trace:
  dependency: transitive
  description:
@@ -432,10 +432,10 @@ packages:
  dependency: transitive
  description:
  name: test_api
- sha256: eb6ac1540b26de412b3403a163d919ba86f6a973fe6cc50ae3541b80092fdcfb
+ sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8"
  url: "https://pub.dev"
  source: hosted
- version: "0.5.1"
+ version: "0.6.0"
  typed_data:
  dependency: transitive
  description:
@@ -452,6 +452,14 @@ packages:
  url: "https://pub.dev"
  source: hosted
  version: "2.1.4"
+ web:
+ dependency: transitive
+ description:
+ name: web
+ sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10
+ url: "https://pub.dev"
+ source: hosted
+ version: "0.1.4-beta"
  xml:
  dependency: transitive
  description:
@@ -461,5 +469,5 @@ packages:
  source: hosted
  version: "6.3.0"
 sdks:
- dart: ">=3.0.5 <4.0.0"
+ dart: ">=3.1.0-185.0.dev <4.0.0"
  flutter: ">=3.3.0"
diff --git a/lib/src/ui/reader_widget.dart b/lib/src/ui/reader_widget.dart
@@ -191,7 +191,6 @@ class _ReaderWidgetState extends State<ReaderWidget>
  }
  break;
  case AppLifecycleState.inactive:
- case AppLifecycleState.hidden:
  case AppLifecycleState.paused:
  case AppLifecycleState.hidden:
  controller?.dispose();
@@ -200,8 +199,6 @@ class _ReaderWidgetState extends State<ReaderWidget>
  });
  break;
  case AppLifecycleState.detached:
- default:
- break;
  }
  }
 

diff --git a/zxscanner/analysis_options.yaml b/zxscanner/analysis_options.yaml
@@ -105,14 +105,12 @@ linter:
  - hash_and_equals
  - implementation_imports
  # - invariant_booleans # too many false positives: https://github.com/dart-lang/linter/issues/811
- - iterable_contains_unrelated_type
  # - join_return_with_assignment # not required by flutter style
  - leading_newlines_in_multiline_strings
  - library_names
  - library_prefixes
  - library_private_types_in_public_api
  # - lines_longer_than_80_chars # not required by flutter style
- - list_remove_unrelated_type
  # - literal_only_boolean_expressions # too many false positives: https://github.com/dart-lang/linter/issues/453
  - missing_whitespace_between_adjacent_strings
  - no_adjacent_strings_in_list