[1.1.6] Clean code and update

.metadata

@@ -4,7 +4,7 @@
 # This file should be version controlled and should not be manually edited.
 
 version:
-  revision: 5f105a6ca7a5ac7b8bc9b241f4c2d86f4188cf5c
+  revision: c860cba910319332564e1e9d470a17074c1f2dfd
   channel: stable
 
 project_type: app

analysis_options.yaml

@@ -1 +1,74 @@
-include: package:lint/analysis_options.yaml
+include: package:lint/analysis_options.yaml
+
+analyzer:
+  exclude:
+    - "**/*.g.dart"
+    - "**/*.freezed.dart"
+  errors:
+    invalid_annotation_target: ignore
+
+linter:
+  rules:
+    - always_require_non_null_named_parameters
+    - annotate_overrides
+    - avoid_function_literals_in_foreach_calls
+    - avoid_init_to_null
+    - avoid_null_checks_in_equality_operators
+    - avoid_renaming_method_parameters
+    - avoid_return_types_on_setters
+    - avoid_returning_null_for_void
+    - avoid_single_cascade_in_expression_statements
+    - avoid_unnecessary_containers
+    - constant_identifier_names
+    - control_flow_in_finally
+    - empty_constructor_bodies
+    - empty_statements
+    - exhaustive_cases
+    - implementation_imports
+    - library_names
+    - library_prefixes
+    - null_closures
+    - no_logic_in_create_state
+    - overridden_fields
+    - package_names
+    - prefer_adjacent_string_concatenation
+    - prefer_collection_literals
+    - prefer_conditional_assignment
+    - prefer_contains
+    - prefer_const_constructors
+    - prefer_const_constructors_in_immutables
+    - prefer_const_declarations
+    - prefer_const_literals_to_create_immutables
+    - prefer_equal_for_default_values
+    - prefer_final_fields
+    - prefer_for_elements_to_map_fromIterable
+    - prefer_function_declarations_over_variables
+    - prefer_if_null_operators
+    - prefer_initializing_formals
+    - prefer_inlined_adds
+    - prefer_is_empty
+    - prefer_is_not_operator
+    - prefer_null_aware_operators
+    - prefer_spread_collections
+    - prefer_void_to_null
+    - require_trailing_commas
+    - recursive_getters
+    - sized_box_for_whitespace
+    - slash_for_doc_comments
+    - sort_child_properties_last
+    - sort_constructors_first
+    - sort_pub_dependencies
+    - type_init_formals
+    - unnecessary_brace_in_string_interps
+    - unnecessary_const
+    - unnecessary_getters_setters
+    - unnecessary_new
+    - unnecessary_null_in_if_null_operators
+    - unnecessary_string_escapes
+    - unnecessary_string_interpolations
+    - unnecessary_this
+    - use_full_hex_values_for_flutter_colors
+    - use_function_type_syntax_for_parameters
+    - use_key_in_widget_constructors
+    - use_named_constants
+    - use_rethrow_when_possible

android/app/build.gradle

@@ -32,7 +32,7 @@ if (keystorePropertiesFile.exists()) {
 }
 
 android {
-    compileSdkVersion 31
+    compileSdkVersion 32
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
@@ -50,7 +50,7 @@ android {
     defaultConfig {
         applicationId "com.carapacik.reactiontest"
         minSdkVersion 23
-        targetSdkVersion 31
+        targetSdkVersion 32
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
     }

android/build.gradle

@@ -6,7 +6,7 @@ buildscript {
     }
 
     dependencies {
-        classpath "com.android.tools.build:gradle:7.1.0"
+        classpath "com.android.tools.build:gradle:7.1.2"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }

android/gradle/wrapper/gradle-wrapper.properties

@@ -1,4 +1,3 @@
-#Thu Feb 03
 distributionBase=GRADLE_USER_HOME
 distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
 distributionPath=wrapper/dists

ios/Flutter/AppFrameworkInfo.plist

@@ -21,6 +21,6 @@
   <key>CFBundleVersion</key>
   <string>1.0</string>
   <key>MinimumOSVersion</key>
-  <string>9.0</string>
+  <string>10.0</string>
 </dict>
 </plist>

ios/Runner.xcodeproj/project.pbxproj

@@ -272,7 +272,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;
@@ -349,7 +349,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -398,7 +398,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;

ios/Runner/Info.plist

@@ -5,15 +5,15 @@
 	<key>CFBundleDevelopmentRegion</key>
 	<string>$(DEVELOPMENT_LANGUAGE)</string>
 	<key>CFBundleDisplayName</key>
-	<string>ReactionTest</string>
+	<string>Reactiontest</string>
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
 	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
-	<string>Reaction Test</string>
+	<string>reactiontest</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>

lib/app.dart

@@ -1,15 +1,12 @@
 import 'package:flutter/material.dart';
-import 'package:reactiontest/main_page/main_view.dart'
-    if (dart.library.html) 'package:reactiontest/main_page/main_view.dart'
-    if (dart.library.io) 'package:reactiontest/main_page/main_view_io.dart'
-    as mv;
+import 'package:reactiontest/main_page/main_view.dart';
 import 'package:reactiontest/settings_page/settings_controller.dart';
 import 'package:reactiontest/settings_page/settings_view.dart';
 
 class App extends StatelessWidget {
   const App({
-    Key? key,
     required this.settingsController,
+    Key? key,
   }) : super(key: key);
 
   final SettingsController settingsController;
@@ -47,9 +44,9 @@ class App extends StatelessWidget {
                 switch (routeSettings.name) {
                   case SettingsView.routeName:
                     return SettingsView(controller: settingsController);
-                  case mv.MainView.routeName:
+                  case MainView.routeName:
                   default:
-                    return const mv.MainView();
+                    return const MainView();
                 }
               },
             );

lib/main.dart

@@ -4,17 +4,16 @@ import 'package:flutter_dotenv/flutter_dotenv.dart';
 import 'package:reactiontest/app.dart';
 import 'package:reactiontest/settings_page/settings_controller.dart';
 import 'package:reactiontest/settings_page/settings_service.dart';
-import 'package:reactiontest/utils.dart'
-    if (dart.library.io) 'package:reactiontest/utils_io.dart' as utils;
+import 'package:reactiontest/utils.dart';
 import 'package:url_strategy/url_strategy.dart';
 
 Future<void> main() async {
+  WidgetsFlutterBinding.ensureInitialized();
+  SystemChrome.setPreferredOrientations([DeviceOrientation.portraitUp]);
   setPathUrlStrategy();
   final settingsController = SettingsController(SettingsService());
   await settingsController.loadSettings();
   await dotenv.load();
-  WidgetsFlutterBinding.ensureInitialized();
-  utils.initAd();
-  SystemChrome.setPreferredOrientations([DeviceOrientation.portraitUp]);
+  await initAd();
   runApp(App(settingsController: settingsController));
 }

lib/main_page/body.dart

@@ -3,8 +3,7 @@ import 'dart:math';
 
 import 'package:flutter/material.dart';
 import 'package:reactiontest/main_page/timer_state.dart';
-import 'package:reactiontest/utils.dart'
-    if (dart.library.io) 'package:reactiontest/utils_io.dart' as utils;
+import 'package:reactiontest/utils.dart';
 
 class Body extends StatefulWidget {
   const Body({Key? key}) : super(key: key);
@@ -157,7 +156,7 @@ class _BodyState extends State<Body> {
           _reviewCounter++;
         }
         if (_reviewCounter > 6) {
-          utils.appearReview();
+          appearReview();
         }
         break;
       case TimerState.disableOnWait:

lib/main_page/main_view.dart

@@ -1,12 +1,41 @@
+import 'dart:io';
+
+import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
+import 'package:google_mobile_ads/google_mobile_ads.dart';
 import 'package:reactiontest/main_page/body.dart';
 import 'package:reactiontest/settings_page/settings_view.dart';
+import 'package:reactiontest/utils.dart';
 
-class MainView extends StatelessWidget {
+class MainView extends StatefulWidget {
   const MainView({Key? key}) : super(key: key);
 
   static const routeName = '/';
 
+  @override
+  State<MainView> createState() => _MainViewState();
+}
+
+class _MainViewState extends State<MainView> {
+  bool _bannerAdIsLoaded = false;
+  BannerAd? _bannerAd;
+
+  @override
+  void didChangeDependencies() {
+    super.didChangeDependencies();
+    if (!kIsWeb && (Platform.isAndroid || Platform.isIOS) && adUnitId != null) {
+      _bannerAd = BannerAd(
+        size: AdSize.banner,
+        adUnitId: adUnitId!,
+        listener: BannerAdListener(
+          onAdLoaded: (ad) => setState(() => _bannerAdIsLoaded = true),
+          onAdFailedToLoad: (ad, error) => ad.dispose(),
+        ),
+        request: const AdRequest(),
+      )..load();
+    }
+  }
+
   @override
   Widget build(BuildContext context) {
     return Scaffold(
@@ -22,6 +51,20 @@ class MainView extends StatelessWidget {
         ],
       ),
       body: const Body(),
+      bottomNavigationBar: SizedBox(
+        height: AdSize.banner.height.toDouble(),
+        width: AdSize.banner.width.toDouble(),
+        child: _bannerAdIsLoaded && _bannerAd != null
+            ? AdWidget(ad: _bannerAd!)
+            : null,
+      ),
     );
   }
+
+  @override
+  void dispose() {
+    super.dispose();
+    _bannerAd?.dispose();
+    _bannerAdIsLoaded = false;
+  }
 }