diff --git a/android/app/build.gradle b/android/app/build.gradle
index 7cfdc96..a5d8367 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -33,7 +33,7 @@ if (keystorePropertiesFile.exists()) {
 }
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion 33
 
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 31a79ae..6008189 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -6,38 +6,38 @@
          additional functionality it is fine to subclass or reimplement
          FlutterApplication and put your custom class here. -->
     <application
-        android:name="io.flutter.app.FlutterApplication"
-        android:label="@string/app_name"
+        android:name="${applicationName}"
         android:icon="@mipmap/ic_launcher"
-        android:roundIcon="@mipmap/ic_launcher_round"
-        >
+        android:label="@string/app_name"
+        android:roundIcon="@mipmap/ic_launcher_round">
         <activity
             android:name=".MainActivity"
-            android:launchMode="singleTop"
-            android:theme="@style/LaunchTheme"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
             android:hardwareAccelerated="true"
+            android:launchMode="singleTop"
+            android:theme="@style/LaunchTheme"
             android:windowSoftInputMode="adjustResize">
             <!-- Specifies an Android theme to apply to this Activity as soon as
                  the Android process has started. This theme is visible to the user
                  while the Flutter UI initializes. After that, this theme continues
                  to determine the Window background behind the Flutter UI. -->
             <meta-data
-              android:name="io.flutter.embedding.android.NormalTheme"
-              android:resource="@style/NormalTheme"
-              />
+                android:name="io.flutter.embedding.android.NormalTheme"
+                android:resource="@style/NormalTheme" />
+            <meta-data
+                android:name="flutterEmbedding"
+                android:value="2" />
             <!-- Displays an Android View that continues showing the launch screen
                  Drawable until Flutter paints its first frame, then this splash
                  screen fades out. A splash screen is useful to avoid any visual
                  gap between the end of Android's launch screen and the painting of
                  Flutter's first frame. -->
             <meta-data
-              android:name="io.flutter.embedding.android.SplashScreenDrawable"
-              android:resource="@drawable/launch_background"
-              />
+                android:name="io.flutter.embedding.android.SplashScreenDrawable"
+                android:resource="@drawable/launch_background" />
             <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <category android:name="android.intent.category.LAUNCHER"/>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
         <!-- Don't delete the meta-data below.
diff --git a/android/build.gradle b/android/build.gradle
index 3100ad2..127e7c4 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -1,12 +1,12 @@
 buildscript {
-    ext.kotlin_version = '1.3.50'
+    ext.kotlin_version = '1.9.0'
     repositories {
         google()
         jcenter()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.0'
+        classpath 'com.android.tools.build:gradle:7.4.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
@@ -26,6 +26,6 @@ subprojects {
     project.evaluationDependsOn(':app')
 }
 
-task clean(type: Delete) {
+tasks.register("clean", Delete) {
     delete rootProject.buildDir
 }
diff --git a/android/gradle.properties b/android/gradle.properties
index 38c8d45..3dbac08 100644
--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -1,4 +1,4 @@
 org.gradle.jvmargs=-Xmx1536M
 android.enableR8=true
 android.useAndroidX=true
-android.enableJetifier=true
+android.enableJetifier=false
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
index da44bc1..cfe88f6 100644
--- a/android/gradle/wrapper/gradle-wrapper.properties
+++ b/android/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-all.zip
diff --git a/lib/comps/cigaratte.dart b/lib/comps/cigaratte.dart
index 2aebea0..6172a29 100644
--- a/lib/comps/cigaratte.dart
+++ b/lib/comps/cigaratte.dart
@@ -1,22 +1,22 @@
 import 'package:quitsmoke/static/htimes.dart';
+
 class Cigaratte {
+  Cigaratte({
+    required this.startDate,
+    required this.pricePerCigaratte,
+    required this.dailyCigarattes,
+    this.lang,
+  })  : cigarattePerSecond = dailyCigarattes / (24 * 60 * 60.0),
+        moneyPerSecond = dailyCigarattes / (24 * 60 * 60.0) * pricePerCigaratte;
+
   final DateTime startDate;
   final double pricePerCigaratte;
   final int dailyCigarattes;
-  final String lang;
+  final String? lang;
 
-  double cigarattePerSecond;
-  double moneyPerSecond;
-  double toUp = 0;
-
-  Cigaratte(
-      {this.startDate,
-      this.pricePerCigaratte,
-      this.dailyCigarattes,
-      this.lang}) {
-    cigarattePerSecond = dailyCigarattes / (24 * 60 * 60.0);
-    moneyPerSecond = cigarattePerSecond * pricePerCigaratte;
-  }
+  final double cigarattePerSecond;
+  final double moneyPerSecond;
+  final double toUp = 0;
 
   Duration calculatePassedTime() {
     DateTime now = DateTime.now();
diff --git a/lib/comps/particle.dart b/lib/comps/particle.dart
index 29143b9..58a0eee 100644
--- a/lib/comps/particle.dart
+++ b/lib/comps/particle.dart
@@ -1,28 +1,24 @@
-import 'dart:math';
-
 import 'package:flutter/material.dart';
 import 'package:quitsmoke/comps/particleSpawner.dart';
 
 class ParticlePainter extends CustomPainter {
+  ParticlePainter({
+    required this.particleCount,
+    required this.particles,
+  })  : mPaint = new Paint(),
+        bgPaint = new Paint()..color = Color.fromARGB(120, 145, 132, 245),
+        super(repaint: particles);
+
   final int particleCount;
   int particleRadius = 3;
   int sprayRadius = 100;
 
   ParticleSpawner particles;
-  Rect _area;
   Paint mPaint;
   Paint bgPaint;
 
-  ParticlePainter({this.particleCount, this.particles})
-      : super(repaint: particles) {
-    mPaint = new Paint();
-    bgPaint = new Paint()..color = Color.fromARGB(120, 145, 132, 245);
-  }
-
   @override
   void paint(Canvas canvas, Size size) {
-    if (particles == null) return;
-
     for (final particle in particles.particles) {
       _drawParticle(particle, canvas);
     }
@@ -34,14 +30,27 @@ class ParticlePainter extends CustomPainter {
   }
 
   _drawParticle(Particle particle, Canvas canvas) {
-    final random = Random();
     canvas.drawOval(
-        Rect.fromLTWH(particle.x, particle.y, particle.r, particle.r),
-        Paint()..color = particle.color);
+      Rect.fromLTWH(particle.x, particle.y, particle.r, particle.r),
+      Paint()..color = particle.color,
+    );
   }
 }
 
 class Particle {
+  Particle({
+    required double xval,
+    required double yval,
+    required double vvalX,
+    required double vvalY,
+    this.color = Colors.black,
+    double? avalX,
+    double? avalY,
+  })  : x = xval,
+        y = yval,
+        vX = vvalX,
+        vY = vvalY;
+
   double vX;
   double vY;
 
@@ -50,20 +59,6 @@ class Particle {
   double r = 3;
   final Color color;
 
-  Particle(
-      {double xval,
-      double yval,
-      double avalX,
-      double avalY,
-      double vvalX,
-      double vvalY,
-      this.color}) {
-    x = xval;
-    y = yval;
-    vX = vvalX;
-    vY = vvalY;
-  }
-
   update() {
     x += vX;
     y += vY;
diff --git a/lib/comps/particlePainer.dart b/lib/comps/particlePainer.dart
index 3c5fc35..97d7b02 100644
--- a/lib/comps/particlePainer.dart
+++ b/lib/comps/particlePainer.dart
@@ -7,29 +7,29 @@ import 'package:quitsmoke/comps/particleSpawner.dart';
 
 class ParticlePainterWidget extends StatefulWidget {
   final Size widgetSize;
-  ParticlePainterWidget({Key key, this.widgetSize}) : super(key: key);
+
+  ParticlePainterWidget({Key? key, required this.widgetSize}) : super(key: key);
 
   @override
   _ParticlePainterWidgetState createState() => _ParticlePainterWidgetState();
 }
 
 class _ParticlePainterWidgetState extends State<ParticlePainterWidget> {
-  Timer _timer;
-  ValueNotifier<double> _time;
+  late Timer _timer;
+  late final ValueNotifier<double> _time;
 
-  ParticleSpawner particles;
+  late final ParticleSpawner particles;
 
   @override
   void initState() {
     super.initState();
 
-    particles = new ParticleSpawner(size: widget.widgetSize);
-    particles.createParticles(3);
+    particles = ParticleSpawner(size: widget.widgetSize)..createParticles(3);
 
     _time = ValueNotifier(0);
 
     // Setup timer.
-    final begin = DateTime.now();
+
     _timer = Timer.periodic(
       Duration(
         microseconds: 1e6 ~/ 60, // 60 FPS
diff --git a/lib/comps/particleSpawner.dart b/lib/comps/particleSpawner.dart
index 0865c70..83ecc97 100644
--- a/lib/comps/particleSpawner.dart
+++ b/lib/comps/particleSpawner.dart
@@ -4,13 +4,15 @@ import 'package:flutter/material.dart';
 import 'package:quitsmoke/comps/particle.dart';
 
 class ParticleSpawner with ChangeNotifier {
-  List<Particle> particles = [];
-  double initialX;
-  double initialY;
+  ParticleSpawner({required this.size});
+
   final Size size;
+  late double initialX;
+  late double initialY;
+  List<Particle> particles = [];
   double degree = 0;
   double sprayRadius = 70;
-  ParticleSpawner({this.size});
+
   createParticles(int count) {
     final random = Random();
     initialX = size.width / 2;
@@ -37,13 +39,14 @@ class ParticleSpawner with ChangeNotifier {
   }
 
   updateParticles() {
-    for (var particle in particles) {
-      particle.update();
-    }
-    particles.removeWhere((element) =>
-        (initialX - element.x).abs() > sprayRadius ||
-        (initialY - element.y).abs() > sprayRadius ||
-        (element.vX.abs() < 0.1 && element.vY.abs() < 0.1));
+    for (var particle in particles) particle.update();
+
+    particles.removeWhere(
+      (element) =>
+          (initialX - element.x).abs() > sprayRadius ||
+          (initialY - element.y).abs() > sprayRadius ||
+          (element.vX.abs() < 0.1 && element.vY.abs() < 0.1),
+    );
 
     notifyListeners();
   }
diff --git a/lib/comps/progress_painter.dart b/lib/comps/progress_painter.dart
index f980736..dda1d9e 100644
--- a/lib/comps/progress_painter.dart
+++ b/lib/comps/progress_painter.dart
@@ -1,6 +1,4 @@
 import 'dart:math';
-import 'dart:ui';
-
 import 'package:flutter/material.dart';
 
 class ProgressPainter extends CustomPainter {
@@ -9,11 +7,12 @@ class ProgressPainter extends CustomPainter {
   final double completedPercentage;
   final double circleWidth;
 
-  ProgressPainter(
-      {this.defaultCircleColor,
-      this.percentageCompletedCircleColor,
-      this.circleWidth,
-      this.completedPercentage});
+  ProgressPainter({
+    required this.defaultCircleColor,
+    required this.percentageCompletedCircleColor,
+    required this.circleWidth,
+    required this.completedPercentage,
+  });
 
   getPaint(Color color) {
     return Paint()
diff --git a/lib/comps/snappable.dart b/lib/comps/snappable.dart
index 46e1ec2..561482e 100644
--- a/lib/comps/snappable.dart
+++ b/lib/comps/snappable.dart
@@ -1,7 +1,6 @@
 library snappable;
 
 import 'dart:math' as math;
-import 'dart:typed_data';
 import 'dart:ui';
 
 import 'package:flutter/foundation.dart';
@@ -36,11 +35,11 @@ class Snappable extends StatefulWidget {
   final bool snapOnTap;
 
   /// Function that gets called when snap ends
-  final VoidCallback onSnapped;
+  final VoidCallback? onSnapped;
 
   const Snappable({
-    Key key,
-    @required this.child,
+    Key? key,
+    required this.child,
     this.offset = const Offset(64, -32),
     this.duration = const Duration(milliseconds: 5000),
     this.randomDislocationOffset = const Offset(64, 32),
@@ -62,19 +61,19 @@ class SnappableState extends State<Snappable>
   bool get isGone => _animationController.isCompleted;
 
   /// Main snap effect controller
-  AnimationController _animationController;
+  late AnimationController _animationController;
 
   /// Key to get image of a [widget.child]
   GlobalKey _globalKey = GlobalKey();
 
   /// Layers of image
-  List<Uint8List> _layers;
+  List<Uint8List>? _layers;
 
   /// Values from -1 to 1 to dislocate the layers a bit
-  List<double> _randoms;
+  List<double>? _randoms;
 
   /// Size of child widget
-  Size size;
+  Size? size;
 
   @override
   void initState() {
@@ -86,7 +85,7 @@ class SnappableState extends State<Snappable>
 
     if (widget.onSnapped != null) {
       _animationController.addStatusListener((status) {
-        if (status == AnimationStatus.completed) widget.onSnapped();
+        if (status == AnimationStatus.completed) widget.onSnapped?.call();
       });
     }
   }
@@ -104,11 +103,11 @@ class SnappableState extends State<Snappable>
       child: Stack(
         alignment: Alignment.center,
         children: <Widget>[
-          if (_layers != null) ..._layers.map(_imageToWidget),
+          if (_layers != null) ..._layers!.map(_imageToWidget),
           AnimatedBuilder(
             animation: _animationController,
             builder: (context, child) {
-              return _animationController.isDismissed ? child : Container();
+              return _animationController.isDismissed ? child! : Container();
             },
             child: RepaintBoundary(
               key: _globalKey,
@@ -128,7 +127,7 @@ class SnappableState extends State<Snappable>
     //create an image for every bucket
     List<image.Image> _images = List<image.Image>.generate(
       widget.numberOfBuckets,
-      (i) => image.Image(fullImage.width, fullImage.height),
+      (i) => image.Image(width: fullImage.width, height: fullImage.height),
     );
 
     //for every line of pixels
@@ -147,7 +146,7 @@ class SnappableState extends State<Snappable>
       //for every pixel in a line
       for (int x = 0; x < fullImage.width; x++) {
         //get the pixel from fullImage
-        int pixel = fullImage.getPixel(x, y);
+        final pixel = fullImage.getPixel(x, y);
         //choose a bucket for a pixel
         int imageIndex = _pickABucket(weights, sumOfWeights);
         //set the pixel from chosen bucket
@@ -183,10 +182,11 @@ class SnappableState extends State<Snappable>
 
   Widget _imageToWidget(Uint8List layer) {
     //get layer's index in the list
-    int index = _layers.indexOf(layer);
+    int index = _layers?.indexOf(layer) ?? 0;
 
     //based on index, calculate when this layer should start and end
-    double animationStart = (index / _layers.length) * _lastLayerAnimationStart;
+    double animationStart =
+        (index / (_layers?.length ?? 1)) * _lastLayerAnimationStart;
     double animationEnd = animationStart + _singleLayerAnimationLength;
 
     //create interval animation using only part of whole animation
@@ -200,8 +200,8 @@ class SnappableState extends State<Snappable>
     );
 
     Offset randomOffset = widget.randomDislocationOffset.scale(
-      _randoms[index],
-      _randoms[index],
+      _randoms![index],
+      _randoms![index],
     );
 
     Animation<Offset> offsetAnimation = Tween<Offset>(
@@ -240,15 +240,14 @@ class SnappableState extends State<Snappable>
 
   /// Gets an Image from a [child] and caches [size] for later us
   Future<image.Image> _getImageFromWidget() async {
-    RenderRepaintBoundary boundary =
-        _globalKey.currentContext.findRenderObject();
+    RenderRepaintBoundary boundary = RenderRepaintBoundary();
     //cache image for later
     size = boundary.size;
     var img = await boundary.toImage();
     var byteData = await img.toByteData(format: ImageByteFormat.png);
-    var pngBytes = byteData.buffer.asUint8List();
+    var pngBytes = byteData!.buffer.asUint8List();
 
-    return image.decodeImage(pngBytes);
+    return image.decodeImage(pngBytes)!;
   }
 
   int _gauss(double center, double value) =>
diff --git a/lib/main.dart b/lib/main.dart
index eeac01e..071242a 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -2,8 +2,6 @@ import 'dart:io';
 
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
-import 'package:flutter_local_notifications/flutter_local_notifications.dart';
-import 'package:flutter_native_timezone/flutter_native_timezone.dart';
 import 'package:intl/date_symbol_data_local.dart';
 import 'package:intl/intl.dart';
 import 'package:quitsmoke/notification_manager.dart';
@@ -31,8 +29,10 @@ void main() async {
 
 Future<void> _configureLocalTimeZone() async {
   tz.initializeTimeZones();
-  final String timeZoneName = await FlutterNativeTimezone.getLocalTimezone();
-  tz.setLocalLocation(tz.getLocation(timeZoneName));
+
+  final locations = tz.timeZoneDatabase.locations;
+  final timeZoneName = tz.getLocation(locations.keys.first);
+  tz.setLocalLocation(tz.getLocation(timeZoneName.name));
 }
 
 class MyApp extends StatelessWidget {
@@ -46,14 +46,14 @@ class MyApp extends StatelessWidget {
 
         if (!currentFocus.hasPrimaryFocus &&
             currentFocus.focusedChild != null) {
-          FocusManager.instance.primaryFocus.unfocus();
+          FocusManager.instance.primaryFocus?.unfocus();
         }
       },
       child: MaterialApp(
         builder: (context, child) {
           return MediaQuery(
             data: MediaQuery.of(context).copyWith(textScaleFactor: 1),
-            child: child,
+            child: child!,
           );
         },
         debugShowCheckedModeBanner: false,
diff --git a/lib/notification_manager.dart b/lib/notification_manager.dart
index 587e8fe..06d297d 100644
--- a/lib/notification_manager.dart
+++ b/lib/notification_manager.dart
@@ -1,5 +1,4 @@
 import 'package:flutter_local_notifications/flutter_local_notifications.dart';
-import 'package:timezone/data/latest.dart' as tz;
 import 'package:timezone/timezone.dart' as tz;
 
 final FlutterLocalNotificationsPlugin flutterLocalNotificationsPlugin =
@@ -11,7 +10,8 @@ const CHANNEL_DESC = "Reminders";
 class NotificationManager {
   static sendNotification({title, body}) async {
     const AndroidNotificationDetails androidPlatformChannelSpecifics =
-        AndroidNotificationDetails(CHANNEL_ID, CHANNEL_NAME, CHANNEL_DESC,
+        AndroidNotificationDetails(CHANNEL_ID, CHANNEL_NAME,
+            channelDescription: CHANNEL_DESC,
             importance: Importance.max,
             priority: Priority.high,
             showWhen: false);
@@ -27,12 +27,17 @@ class NotificationManager {
 
   static periodicallyShow({title, body}) async {
     const AndroidNotificationDetails androidPlatformChannelSpecifics =
-        AndroidNotificationDetails(CHANNEL_ID, CHANNEL_NAME, CHANNEL_DESC);
+        AndroidNotificationDetails(CHANNEL_ID, CHANNEL_NAME,
+            channelDescription: CHANNEL_DESC);
     const NotificationDetails platformChannelSpecifics =
         NotificationDetails(android: androidPlatformChannelSpecifics);
     await flutterLocalNotificationsPlugin.periodicallyShow(
-        0, title, body, RepeatInterval.daily, platformChannelSpecifics,
-        androidAllowWhileIdle: true);
+      0,
+      title,
+      body,
+      RepeatInterval.daily,
+      platformChannelSpecifics,
+    );
   }
 
   static dailyNotification({title, body}) async {
@@ -52,10 +57,9 @@ class NotificationManager {
         'weekly scheduled notification body',
         _nextInstanceOfTenAM(),
         const NotificationDetails(
-          android: AndroidNotificationDetails(
-              CHANNEL_ID, CHANNEL_NAME, CHANNEL_DESC),
+          android: AndroidNotificationDetails(CHANNEL_ID, CHANNEL_NAME,
+              channelDescription: CHANNEL_DESC),
         ),
-        androidAllowWhileIdle: true,
         uiLocalNotificationDateInterpretation:
             UILocalNotificationDateInterpretation.absoluteTime,
         matchDateTimeComponents: DateTimeComponents.dayOfWeekAndTime);
@@ -67,16 +71,16 @@ class NotificationManager {
 
   static scheduleNotification({title, body}) async {
     await flutterLocalNotificationsPlugin.zonedSchedule(
-        0,
-        title,
-        body,
-        tz.TZDateTime.now(tz.local).add(const Duration(seconds: 20)),
-        const NotificationDetails(
-            android: AndroidNotificationDetails(
-                CHANNEL_ID, CHANNEL_NAME, CHANNEL_DESC)),
-        androidAllowWhileIdle: true,
-        uiLocalNotificationDateInterpretation:
-            UILocalNotificationDateInterpretation.absoluteTime);
+      0,
+      title,
+      body,
+      tz.TZDateTime.now(tz.local).add(const Duration(seconds: 20)),
+      const NotificationDetails(
+          android: AndroidNotificationDetails(CHANNEL_ID, CHANNEL_NAME,
+              channelDescription: CHANNEL_DESC)),
+      uiLocalNotificationDateInterpretation:
+          UILocalNotificationDateInterpretation.absoluteTime,
+    );
 
     print("Scheduled");
   }
@@ -87,14 +91,14 @@ class NotificationManager {
 
     /// Note: permissions aren't requested here just to demonstrate that can be
     /// done later
-    final IOSInitializationSettings initializationSettingsIOS =
-        IOSInitializationSettings(
+    final DarwinInitializationSettings initializationSettingsIOS =
+        DarwinInitializationSettings(
       requestAlertPermission: false,
       requestBadgePermission: false,
       requestSoundPermission: false,
     );
-    const MacOSInitializationSettings initializationSettingsMacOS =
-        MacOSInitializationSettings(
+    const DarwinInitializationSettings initializationSettingsMacOS =
+        DarwinInitializationSettings(
             requestAlertPermission: false,
             requestBadgePermission: false,
             requestSoundPermission: false);
@@ -104,13 +108,11 @@ class NotificationManager {
             iOS: initializationSettingsIOS,
             macOS: initializationSettingsMacOS);
     await flutterLocalNotificationsPlugin.initialize(initializationSettings,
-        onSelectNotification: (String payload) async {
-      if (payload != null) {
-        print('notification payload: $payload');
-      }
+        onDidReceiveNotificationResponse: (payload) async {
+      print('notification payload: $payload');
     });
 
-    final bool result = await flutterLocalNotificationsPlugin
+    final bool? result = await flutterLocalNotificationsPlugin
         .resolvePlatformSpecificImplementation<
             IOSFlutterLocalNotificationsPlugin>()
         ?.requestPermissions(
diff --git a/lib/screens/guide_screen.dart b/lib/screens/guide_screen.dart
index 307c5e2..7f66ee8 100644
--- a/lib/screens/guide_screen.dart
+++ b/lib/screens/guide_screen.dart
@@ -12,7 +12,8 @@ import 'package:quitsmoke/static/lang.dart';
 import '../size_config.dart';
 
 class GuideScreen extends StatefulWidget {
-  GuideScreen({Key key, this.cigaratteManager}) : super(key: key);
+  GuideScreen({Key? key, required this.cigaratteManager})
+      : super(key: key);
   final Cigaratte cigaratteManager;
 
   @override
@@ -103,7 +104,7 @@ class _GuideScreenState extends State<GuideScreen> {
                     ),
                     Text(
                       langs[lang]["guideps"]["guides"],
-                      style: Theme.of(context).textTheme.bodyText2.copyWith(
+                      style: Theme.of(context).textTheme.bodyMedium?.copyWith(
                           fontSize: getProportionateScreenWidth(22),
                           color: Colors.black),
                     ),
@@ -160,7 +161,7 @@ class _GuideScreenState extends State<GuideScreen> {
                     left: getProportionateScreenWidth(140),
                     child: Text(
                       langs[lang]["guideps"]["guideto"],
-                      style: Theme.of(context).textTheme.headline3.copyWith(
+                      style: Theme.of(context).textTheme.bodySmall?.copyWith(
                           color: Colors.white,
                           fontSize: getProportionateScreenWidth(32)),
                     ),
@@ -210,7 +211,7 @@ class _GuideScreenState extends State<GuideScreen> {
           ),
           Text(
             "${langs[lang]["home"]["guide"]}",
-            style: Theme.of(context).textTheme.bodyText2.copyWith(
+            style: Theme.of(context).textTheme.bodyMedium?.copyWith(
                 color: Colors.white, fontSize: getProportionateScreenWidth(26)),
           )
         ],
@@ -242,8 +243,14 @@ class PreventCard extends StatelessWidget {
   final String title;
   final String text;
   final String id;
-  const PreventCard({Key key, this.image, this.title, this.text, this.id})
-      : super(key: key);
+
+  const PreventCard({
+    Key? key,
+    required this.image,
+    required this.title,
+    required this.text,
+    required this.id,
+  }) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
@@ -293,7 +300,7 @@ class PreventCard extends StatelessWidget {
                     children: <Widget>[
                       Text(
                         title,
-                        style: Theme.of(context).textTheme.bodyText2.copyWith(
+                        style: Theme.of(context).textTheme.bodyMedium?.copyWith(
                             fontSize: getProportionateScreenWidth(16),
                             color: Colors.black),
                       ),
diff --git a/lib/screens/guideview_screen.dart b/lib/screens/guideview_screen.dart
index c580cd7..2717163 100644
--- a/lib/screens/guideview_screen.dart
+++ b/lib/screens/guideview_screen.dart
@@ -6,9 +6,14 @@ import 'package:quitsmoke/size_config.dart';
 import 'package:quitsmoke/static/lang.dart';
 
 class GuideViewScreen extends StatefulWidget {
-  GuideViewScreen({Key key, this.id, this.lang}) : super(key: key);
+  GuideViewScreen({
+    Key? key,
+    required this.id,
+    required this.lang,
+  }) : super(key: key);
   final String id;
   final String lang;
+
   @override
   _GuideViewScreenState createState() => _GuideViewScreenState();
 }
@@ -16,6 +21,7 @@ class GuideViewScreen extends StatefulWidget {
 class _GuideViewScreenState extends State<GuideViewScreen> {
   Map actual = {};
   List<Map> content = [];
+
   @override
   void initState() {
     actual = langs[widget.lang]["guide"][widget.id];
@@ -54,7 +60,7 @@ class _GuideViewScreenState extends State<GuideViewScreen> {
                 ),
                 AutoSizeText(
                   "${actual["title"]}",
-                  style: Theme.of(context).textTheme.headline3.copyWith(
+                  style: Theme.of(context).textTheme.headlineLarge?.copyWith(
                       color: Colors.black,
                       fontSize: getProportionateScreenWidth(26)),
                   maxLines: 2,
@@ -111,8 +117,8 @@ class _GuideViewScreenState extends State<GuideViewScreen> {
             "$title",
             style: Theme.of(context)
                 .textTheme
-                .bodyText2
-                .copyWith(fontSize: getProportionateScreenWidth(26)),
+                .bodyMedium
+                ?.copyWith(fontSize: getProportionateScreenWidth(26)),
             textAlign: TextAlign.left,
           ),
           new Divider(
@@ -121,7 +127,7 @@ class _GuideViewScreenState extends State<GuideViewScreen> {
           text[0].length == 1
               ? Text(
                   "$text",
-                  style: Theme.of(context).textTheme.bodyText1.copyWith(
+                  style: Theme.of(context).textTheme.bodyMedium?.copyWith(
                       fontSize: getProportionateScreenWidth(22),
                       color: Colors.black.withOpacity(.8)),
                   textAlign: TextAlign.left,
@@ -135,8 +141,8 @@ class _GuideViewScreenState extends State<GuideViewScreen> {
                             "$i",
                             style: Theme.of(context)
                                 .textTheme
-                                .bodyText1
-                                .copyWith(
+                                .bodyMedium
+                                ?.copyWith(
                                     fontSize: getProportionateScreenWidth(22),
                                     color: Colors.black.withOpacity(.8)),
                             textAlign: TextAlign.left,
diff --git a/lib/screens/home_screen.dart b/lib/screens/home_screen.dart
index 8ea8378..4bea524 100644
--- a/lib/screens/home_screen.dart
+++ b/lib/screens/home_screen.dart
@@ -26,10 +26,10 @@ class HomeScreen extends StatefulWidget {
 }
 
 class _HomeScreenState extends State<HomeScreen> {
-  Cigaratte cigaraManager;
-  String lang = "";
-  String currency = "";
-  String tiptext = "";
+  late Cigaratte cigaraManager;
+  String? lang = "";
+  String? currency = "";
+  String? tiptext = "";
 
   Future<void> loadData() async {
     SharedPreferences pref = await SharedPreferences.getInstance();
@@ -37,12 +37,13 @@ class _HomeScreenState extends State<HomeScreen> {
     currency = pref.getString("currency");
 
     cigaraManager = Cigaratte(
-        dailyCigarattes: pref.getInt("dailycigarattes"),
-        pricePerCigaratte: pref.getDouble("pricePerCigaratte"),
-        startDate: DateTime.parse(pref.getString("startTime")));
+        dailyCigarattes: pref.getInt("dailycigarattes") ?? 0,
+        pricePerCigaratte: pref.getDouble("pricePerCigaratte") ?? 0.0,
+        startDate: DateTime.parse(pref.getString("startTime") ?? ''));
   }
 
   int lastRndInt = -1;
+
   @override
   void initState() {
     loadData();
@@ -76,7 +77,7 @@ class _HomeScreenState extends State<HomeScreen> {
   }
 
   showAlertDialog(BuildContext context) {
-    Widget cancelButton = FlatButton(
+    Widget cancelButton = ElevatedButton(
       child: Text(
         "${langs[lang]["home"]["cancel"]}",
       ),
@@ -84,29 +85,29 @@ class _HomeScreenState extends State<HomeScreen> {
         Navigator.of(context).pop();
       },
     );
-    Widget helpButton = FlatButton(
+    Widget helpButton = ElevatedButton(
       child: Text(
         "${langs[lang]["guide"]["ifyouslip"]["title"]}",
       ),
       onPressed: () {
         Navigator.of(context).pop();
         Navigator.push(context, MaterialPageRoute(builder: (_) {
-          return GuideViewScreen(id: "ifyouslip", lang: lang);
+          return GuideViewScreen(id: "ifyouslip", lang: lang ?? '');
         }));
       },
     );
-    Widget helpButton2 = FlatButton(
+    Widget helpButton2 = ElevatedButton(
       child: Text(
         "${langs[lang]["guide"]["managecravings"]["title"]}",
       ),
       onPressed: () {
         Navigator.of(context).pop();
         Navigator.push(context, MaterialPageRoute(builder: (_) {
-          return GuideViewScreen(id: "managecravings", lang: lang);
+          return GuideViewScreen(id: "managecravings", lang: lang ?? '');
         }));
       },
     );
-    Widget continueButton = FlatButton(
+    Widget continueButton = ElevatedButton(
       child: Text(
         "${langs[lang]["home"]["reset"]}",
         style: TextStyle(color: Colors.red),
@@ -144,7 +145,6 @@ class _HomeScreenState extends State<HomeScreen> {
 
   @override
   Widget build(BuildContext context) {
-    if (cigaraManager == null) return Text("");
     Size sc = MediaQuery.of(context).size;
     SizeConfig().init(context);
     return Scaffold(
@@ -206,7 +206,7 @@ class _HomeScreenState extends State<HomeScreen> {
               opacity: tipOpacity,
               child: FittedBox(
                 child: Text(
-                  tiptext,
+                  tiptext ?? '',
                   textAlign: TextAlign.center,
                   style: TextStyle(fontSize: getProportionateScreenWidth(14)),
                 ),
@@ -309,15 +309,15 @@ class _HomeScreenState extends State<HomeScreen> {
             textAlign: TextAlign.center,
             style: Theme.of(context)
                 .textTheme
-                .bodyText2
-                .copyWith(fontSize: getProportionateScreenWidth(18)),
+                .bodyMedium
+                ?.copyWith(fontSize: getProportionateScreenWidth(18)),
           ),
           Padding(
             padding: const EdgeInsets.symmetric(horizontal: 8.0),
             child: AutoSizeText(
               "${langs[lang]["progressDescription"][cigaraManager.upcomingEvent["id"]]}",
               textAlign: TextAlign.center,
-              style: Theme.of(context).textTheme.bodyText1,
+              style: Theme.of(context).textTheme.bodyLarge,
               maxLines: 2,
             ),
           ),
@@ -401,7 +401,11 @@ class _HomeScreenState extends State<HomeScreen> {
     return "";
   }
 
-  Column buildDayItem({int count, bool checked, bool current}) {
+  Column buildDayItem({
+    required int count,
+    required bool checked,
+    required bool current,
+  }) {
     return Column(
       mainAxisAlignment: MainAxisAlignment.center,
       crossAxisAlignment: CrossAxisAlignment.center,
@@ -418,7 +422,7 @@ class _HomeScreenState extends State<HomeScreen> {
                   )
                 : Icon(
                     Icons.adjust,
-                    color: Theme.of(context).backgroundColor,
+                    color: Theme.of(context).colorScheme.background,
                   ),
         SizedBox(
           height: 4,
@@ -459,9 +463,9 @@ class _HomeScreenState extends State<HomeScreen> {
           decoration: BoxDecoration(
               borderRadius: BorderRadius.circular(10),
               border: Border.all(
-                color: Theme.of(context).primaryIconTheme.color,
+                color: Theme.of(context).colorScheme.onSurface,
               ),
-              color: Theme.of(context).backgroundColor,
+              color: Theme.of(context).colorScheme.background,
               boxShadow: [
                 BoxShadow(
                     color: kShadowColor.withOpacity(.32),
@@ -479,7 +483,7 @@ class _HomeScreenState extends State<HomeScreen> {
                     width: getProportionateScreenWidth(150),
                     child: AutoSizeText(
                       title,
-                      style: Theme.of(context).textTheme.bodyText2.copyWith(
+                      style: Theme.of(context).textTheme.bodyMedium?.copyWith(
                           fontSize: getProportionateScreenWidth(16),
                           color: color),
                       maxLines: 2,
@@ -494,7 +498,7 @@ class _HomeScreenState extends State<HomeScreen> {
               SizedBox(height: 5),
               AutoSizeText(
                 text,
-                style: Theme.of(context).textTheme.bodyText2.copyWith(
+                style: Theme.of(context).textTheme.bodyMedium?.copyWith(
                     fontWeight: FontWeight.bold,
                     fontSize: getProportionateScreenWidth(14)),
                 maxLines: 2,
@@ -506,8 +510,15 @@ class _HomeScreenState extends State<HomeScreen> {
     );
   }
 
-  InkWell buildCategoryCard(Size sc, BuildContext context,
-      {Color color, IconData icon, String text, String id, Function onTap}) {
+  InkWell buildCategoryCard(
+    Size sc,
+    BuildContext context, {
+    Color? color,
+    IconData? icon,
+    required String text,
+    required String id,
+    Function()? onTap,
+  }) {
     return InkWell(
       onTap: onTap,
       child: Ink(
@@ -515,10 +526,10 @@ class _HomeScreenState extends State<HomeScreen> {
             horizontal: 10, vertical: getProportionateScreenHeight(15)),
         decoration: BoxDecoration(
             border: Border.all(
-              color: Theme.of(context).primaryIconTheme.color,
+              color: Theme.of(context).colorScheme.primary,
             ),
             borderRadius: BorderRadius.circular(12),
-            color: Theme.of(context).backgroundColor,
+            color: Theme.of(context).colorScheme.background,
             boxShadow: [
               BoxShadow(
                   color: Colors.white,
@@ -546,7 +557,7 @@ class _HomeScreenState extends State<HomeScreen> {
               ),
               AutoSizeText(
                 text,
-                style: Theme.of(context).textTheme.headline4.copyWith(
+                style: Theme.of(context).textTheme.headlineSmall?.copyWith(
                     color: color,
                     fontSize: getProportionateScreenWidth(20),
                     fontWeight: FontWeight.w600),
diff --git a/lib/screens/progress_screen.dart b/lib/screens/progress_screen.dart
index d49a3f4..e782d83 100644
--- a/lib/screens/progress_screen.dart
+++ b/lib/screens/progress_screen.dart
@@ -1,6 +1,4 @@
 import 'dart:async';
-import 'dart:io';
-
 import 'package:auto_size_text/auto_size_text.dart';
 import 'package:flutter/material.dart';
 import 'package:quitsmoke/comps/cigaratte.dart';
@@ -13,7 +11,8 @@ import '../size_config.dart';
 
 class ProgressPage extends StatefulWidget {
   final Cigaratte cigaratteManager;
-  ProgressPage({Key key, this.cigaratteManager}) : super(key: key);
+
+  ProgressPage({Key? key, required this.cigaratteManager}) : super(key: key);
 
   @override
   _ProgressPageState createState() => _ProgressPageState();
@@ -21,7 +20,8 @@ class ProgressPage extends StatefulWidget {
 
 class _ProgressPageState extends State<ProgressPage> {
   String lang = "";
-  Timer statetimer;
+  late Timer statetimer;
+
   @override
   void initState() {
     super.initState();
@@ -86,8 +86,8 @@ class _ProgressPageState extends State<ProgressPage> {
                                         htimes[i]["time"]),
                                     style: Theme.of(context)
                                         .textTheme
-                                        .bodyText2
-                                        .copyWith(
+                                        .bodyMedium
+                                        ?.copyWith(
                                             color: Colors.white,
                                             fontSize:
                                                 getProportionateScreenWidth(
@@ -100,8 +100,8 @@ class _ProgressPageState extends State<ProgressPage> {
                                         [htimes[i]["id"]],
                                     style: Theme.of(context)
                                         .textTheme
-                                        .headline4
-                                        .copyWith(
+                                        .headlineSmall
+                                        ?.copyWith(
                                             color: Colors.white,
                                             fontSize:
                                                 getProportionateScreenWidth(
@@ -180,7 +180,7 @@ class _ProgressPageState extends State<ProgressPage> {
           ),
           Text(
             "${langs[lang]["home"]["progress"]}",
-            style: Theme.of(context).textTheme.bodyText2.copyWith(
+            style: Theme.of(context).textTheme.bodyMedium?.copyWith(
                 color: Colors.white, fontSize: getProportionateScreenWidth(26)),
           )
         ],
diff --git a/lib/screens/reason_screen.dart b/lib/screens/reason_screen.dart
index d85eb5c..235b9f8 100644
--- a/lib/screens/reason_screen.dart
+++ b/lib/screens/reason_screen.dart
@@ -7,16 +7,16 @@ import 'package:quitsmoke/comps/getlang.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 
 class ReasonScreen extends StatefulWidget {
-  ReasonScreen({Key key}) : super(key: key);
+  ReasonScreen({Key? key}) : super(key: key);
 
   @override
   _ReasonScreenState createState() => _ReasonScreenState();
 }
 
 class _ReasonScreenState extends State<ReasonScreen> {
-  String lang;
+  late String lang;
 
-  List<String> reasons;
+  late List<String>? reasons;
 
   void initState() {
     loadReasons();
@@ -26,7 +26,7 @@ class _ReasonScreenState extends State<ReasonScreen> {
 
   void loadReasons() async {
     SharedPreferences pref = await SharedPreferences.getInstance();
-    String _reasons = pref.getString("reason");
+    String _reasons = pref.getString("reason") ?? 'unknown';
     if (!_reasons.startsWith("[")) {
       reasons = [_reasons];
       pref.setString("reason", jsonEncode(reasons));
@@ -64,7 +64,7 @@ class _ReasonScreenState extends State<ReasonScreen> {
           ),
           Text(
             "${langs[lang]["home"]["reason"]}",
-            style: Theme.of(context).textTheme.bodyText2.copyWith(
+            style: Theme.of(context).textTheme.bodyMedium?.copyWith(
                 color: Colors.white, fontSize: getProportionateScreenWidth(26)),
           )
         ],
@@ -94,7 +94,7 @@ class _ReasonScreenState extends State<ReasonScreen> {
               child: Center(
                 child: Text("${langs[lang]["reason"]["somegoodreasons"]}",
                     textAlign: TextAlign.center,
-                    style: Theme.of(context).textTheme.headline4.copyWith(
+                    style: Theme.of(context).textTheme.headlineSmall?.copyWith(
                         color: Colors.white.withAlpha(200),
                         fontWeight: FontWeight.w300,
                         fontSize: getProportionateScreenWidth(36))),
@@ -107,7 +107,7 @@ class _ReasonScreenState extends State<ReasonScreen> {
                   itemBuilder: (BuildContext context, int index) {
                     return renderListElement(index, context);
                   },
-                  itemCount: reasons.length,
+                  itemCount: reasons!.length,
                   separatorBuilder: (BuildContext context, int index) =>
                       const Divider(),
                 ),
@@ -119,11 +119,12 @@ class _ReasonScreenState extends State<ReasonScreen> {
   }
 
   String newReason = "";
+
   FloatingActionButton floatingButton(BuildContext context) {
     return FloatingActionButton(
       onPressed: () {
         if (!_sheetopen)
-          scaffoldState.currentState.showBottomSheet((context) => Container(
+          scaffoldState.currentState!.showBottomSheet((context) => Container(
                 padding: EdgeInsets.all(15),
                 color: Colors.white,
                 height: getProportionateScreenHeight(250),
@@ -133,8 +134,8 @@ class _ReasonScreenState extends State<ReasonScreen> {
                     "${langs[lang]["reason"]["addnew"]}",
                     style: Theme.of(context)
                         .textTheme
-                        .headline4
-                        .copyWith(fontSize: getProportionateScreenWidth(22)),
+                        .headlineSmall
+                        ?.copyWith(fontSize: getProportionateScreenWidth(22)),
                   ),
                   Divider(),
                   TextField(
@@ -145,8 +146,8 @@ class _ReasonScreenState extends State<ReasonScreen> {
                         hintText: "${langs[lang]["reason"]["reason"]}"),
                     style: Theme.of(context)
                         .textTheme
-                        .headline4
-                        .copyWith(fontSize: getProportionateScreenWidth(22)),
+                        .headlineSmall
+                        ?.copyWith(fontSize: getProportionateScreenWidth(22)),
                   ),
                   ElevatedButton(
                     style: TextButton.styleFrom(
@@ -155,7 +156,7 @@ class _ReasonScreenState extends State<ReasonScreen> {
                     child: Text("${langs[lang]["wallet"]["add"]}"),
                     onPressed: () {
                       _sheetopen = false;
-                      reasons.add(newReason);
+                      reasons?.add(newReason);
                       newReason = "";
                       saveReasons();
                       setState(() {});
@@ -174,9 +175,9 @@ class _ReasonScreenState extends State<ReasonScreen> {
 
   Widget renderListElement(int index, BuildContext context) {
     return Dismissible(
-      key: Key(reasons[index]),
+      key: Key(reasons![index]),
       onDismissed: (direction) {
-        reasons.removeAt(index);
+        reasons?.removeAt(index);
         saveReasons();
       },
       confirmDismiss: (DismissDirection direction) async {
@@ -220,7 +221,7 @@ class _ReasonScreenState extends State<ReasonScreen> {
             boxShadow: [
               BoxShadow(
                   blurRadius: 10,
-                  color: Colors.deepPurple[600],
+                  color: Colors.deepPurple[600]!,
                   spreadRadius: 2,
                   offset: Offset(3, 2))
             ],
@@ -229,8 +230,8 @@ class _ReasonScreenState extends State<ReasonScreen> {
         child: Row(
           children: [
             Flexible(
-              child: Text("${reasons[index]}",
-                  style: Theme.of(context).textTheme.headline4.copyWith(
+              child: Text("${reasons![index]}",
+                  style: Theme.of(context).textTheme.headlineSmall?.copyWith(
                       color: Colors.white.withAlpha(200),
                       fontWeight: FontWeight.w300,
                       fontSize: getProportionateScreenWidth(21))),
diff --git a/lib/screens/settings_screen.dart b/lib/screens/settings_screen.dart
index 4aabcec..01aa97d 100644
--- a/lib/screens/settings_screen.dart
+++ b/lib/screens/settings_screen.dart
@@ -1,7 +1,4 @@
-import 'dart:io';
-
 import 'package:flutter/material.dart';
-import 'package:flutter/widgets.dart';
 import 'package:intl/intl.dart';
 import 'package:quitsmoke/comps/getlang.dart';
 import 'package:quitsmoke/static/currencies.dart';
@@ -11,7 +8,7 @@ import 'package:shared_preferences/shared_preferences.dart';
 import '../size_config.dart';
 
 class SettingsScreen extends StatefulWidget {
-  SettingsScreen({Key key}) : super(key: key);
+  SettingsScreen({Key? key}) : super(key: key);
 
   @override
   _SettingsScreenState createState() => _SettingsScreenState();
@@ -19,11 +16,11 @@ class SettingsScreen extends StatefulWidget {
 
 class _SettingsScreenState extends State<SettingsScreen> {
   String lang = "";
-  int dailyCigarattes;
-  double pricePerCigaratte;
-  String currency;
-  TextEditingController controllerday;
-  TextEditingController controllercost;
+  late int? dailyCigarattes;
+  late double? pricePerCigaratte;
+  late String? currency;
+  late final TextEditingController controllerday;
+  late final TextEditingController controllercost;
 
   @override
   void initState() {
@@ -39,7 +36,8 @@ class _SettingsScreenState extends State<SettingsScreen> {
     dailyCigarattes = pref.getInt("dailycigarattes");
     pricePerCigaratte = pref.getDouble("pricePerCigaratte");
     currency = pref.getString("currency");
-    stopDate = DateTime.parse(pref.getString("startTime"));
+    stopDate = (DateTime.tryParse(pref.getString("startTime") ?? '')) ??
+        DateTime.now();
 
     controllerday.text = dailyCigarattes.toString();
     controllercost.text = pricePerCigaratte.toString();
@@ -51,9 +49,9 @@ class _SettingsScreenState extends State<SettingsScreen> {
         dailyCigarattes == null ||
         currency == null) return false;
     SharedPreferences pref = await SharedPreferences.getInstance();
-    pref.setDouble("pricePerCigaratte", pricePerCigaratte);
-    pref.setInt("dailycigarattes", dailyCigarattes);
-    pref.setString("currency", currency);
+    pref.setDouble("pricePerCigaratte", pricePerCigaratte!);
+    pref.setInt("dailycigarattes", dailyCigarattes!);
+    pref.setString("currency", currency!);
     pref.setString("startTime", stopDate.toIso8601String());
     Navigator.pop(context);
   }
@@ -109,8 +107,8 @@ class _SettingsScreenState extends State<SettingsScreen> {
                   langs[lang]["welcome"]["choosecurrency"],
                   style: Theme.of(context)
                       .textTheme
-                      .bodyText2
-                      .copyWith(fontSize: getProportionateScreenWidth(26)),
+                      .bodyMedium
+                      ?.copyWith(fontSize: getProportionateScreenWidth(26)),
                 ),
                 items: currencyList.map((Map value) {
                   return DropdownMenuItem<String>(
@@ -142,14 +140,17 @@ class _SettingsScreenState extends State<SettingsScreen> {
                 SizedBox(
                   width: 10,
                 ),
-                Padding(padding: EdgeInsets.symmetric(horizontal: 50), child:
-                  OutlinedButton(
+                Padding(
+                  padding: EdgeInsets.symmetric(horizontal: 50),
+                  child: OutlinedButton(
                     onPressed: () => _pickDate(context),
                     child: Text(
                       "${langs[lang]["settings"]["change"]}",
                       textAlign: TextAlign.center,
                     ),
-                    style: OutlinedButton.styleFrom(side: BorderSide(color: Theme.of(context).primaryColor, width: 2)),
+                    style: OutlinedButton.styleFrom(
+                        side: BorderSide(
+                            color: Theme.of(context).primaryColor, width: 2)),
                   ),
                 ),
               ],
@@ -157,11 +158,14 @@ class _SettingsScreenState extends State<SettingsScreen> {
             Expanded(
               child: Text(""),
             ),
-            Padding(padding: EdgeInsets.symmetric(horizontal: 50), child:
-              OutlinedButton(
+            Padding(
+              padding: EdgeInsets.symmetric(horizontal: 50),
+              child: OutlinedButton(
                 onPressed: () => saveData(),
                 child: Text(langs[lang]["settings"]["save"]),
-                style: OutlinedButton.styleFrom(side: BorderSide(color: Theme.of(context).primaryColor, width: 2)),
+                style: OutlinedButton.styleFrom(
+                    side: BorderSide(
+                        color: Theme.of(context).primaryColor, width: 2)),
               ),
             ),
           ],
@@ -170,17 +174,17 @@ class _SettingsScreenState extends State<SettingsScreen> {
     );
   }
 
-  DateTime stopDate;
+  late DateTime stopDate;
 
   _pickDate(BuildContext context) async {
-    DateTime date = await showDatePicker(
+    DateTime? date = await showDatePicker(
       context: context,
       firstDate: DateTime(DateTime.now().year - 5),
       lastDate: DateTime.now(),
       initialDate: stopDate,
     );
 
-    TimeOfDay t =
+    TimeOfDay? t =
         await showTimePicker(context: context, initialTime: TimeOfDay.now());
     if (date != null && t != null)
       setState(() {
@@ -214,7 +218,7 @@ class _SettingsScreenState extends State<SettingsScreen> {
           ),
           Text(
             "${langs[lang]["home"]["settings"]}",
-            style: Theme.of(context).textTheme.bodyText2.copyWith(
+            style: Theme.of(context).textTheme.bodyMedium?.copyWith(
                 color: Colors.black, fontSize: getProportionateScreenWidth(26)),
           )
         ],
diff --git a/lib/screens/splash_screen.dart b/lib/screens/splash_screen.dart
index c79d624..d8965f4 100644
--- a/lib/screens/splash_screen.dart
+++ b/lib/screens/splash_screen.dart
@@ -4,7 +4,7 @@ import 'package:quitsmoke/screens/welcome_screen.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 
 class SplashScreen extends StatefulWidget {
-  SplashScreen({Key key}) : super(key: key);
+  SplashScreen({Key? key}) : super(key: key);
 
   @override
   _SplashScreenState createState() => _SplashScreenState();
diff --git a/lib/screens/wallet_screen.dart b/lib/screens/wallet_screen.dart
index cf7e9ed..476d8bf 100644
--- a/lib/screens/wallet_screen.dart
+++ b/lib/screens/wallet_screen.dart
@@ -1,10 +1,8 @@
 import 'dart:async';
 import 'dart:convert';
-import 'dart:io';
 
 import 'package:auto_size_text/auto_size_text.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
 import 'package:intl/intl.dart';
 import 'package:quitsmoke/comps/cigaratte.dart';
 import 'package:quitsmoke/comps/getlang.dart';
@@ -16,7 +14,8 @@ import '../size_config.dart';
 
 class WalletScreen extends StatefulWidget {
   final Cigaratte cigaratteManager;
-  WalletScreen({Key key, this.cigaratteManager}) : super(key: key);
+
+  WalletScreen({Key? key, required this.cigaratteManager}) : super(key: key);
 
   @override
   _WalletScreenState createState() => _WalletScreenState();
@@ -41,7 +40,7 @@ class _WalletScreenState extends State<WalletScreen> {
 
   _getTransactions() async {
     SharedPreferences pref = await SharedPreferences.getInstance();
-    currency = pref.getString("currency");
+    currency = pref.getString("currency") ?? 'unknown';
     var tr = jsonDecode((pref.getString("transactionData") ?? "[]"));
     for (var e in tr) {
       trlist.add(Transaction(
@@ -53,8 +52,12 @@ class _WalletScreenState extends State<WalletScreen> {
     setState(() {});
   }
 
-  _addTransaction(
-      {DateTime date, double price, String title, String description}) {
+  _addTransaction({
+    required DateTime date,
+    required double price,
+    required String title,
+    required String description,
+  }) {
     if (price > currentBalance) return;
     trlist.insert(
         0,
@@ -79,7 +82,8 @@ class _WalletScreenState extends State<WalletScreen> {
     pref.setString("transactionData", jsonEncode(lister));
   }
 
-  Timer statetimer;
+  late Timer statetimer;
+
   @override
   void initState() {
     lang = getLang();
@@ -97,7 +101,8 @@ class _WalletScreenState extends State<WalletScreen> {
     super.dispose();
   }
 
-  String _tsdescription;
+  String? _tsdescription;
+
   @override
   Widget build(BuildContext context) {
     SizeConfig().init(context);
@@ -106,7 +111,7 @@ class _WalletScreenState extends State<WalletScreen> {
       floatingActionButton: FloatingActionButton(
         onPressed: () {
           if (!_sheetopen)
-            scaffoldState.currentState.showBottomSheet((context) => Container(
+            scaffoldState.currentState!.showBottomSheet((context) => Container(
                   padding: EdgeInsets.all(15),
                   color: Colors.white,
                   height: getProportionateScreenHeight(340),
@@ -116,8 +121,8 @@ class _WalletScreenState extends State<WalletScreen> {
                       "${langs[lang]["wallet"]["newtransaction"]}",
                       style: Theme.of(context)
                           .textTheme
-                          .headline4
-                          .copyWith(fontSize: getProportionateScreenWidth(22)),
+                          .headlineSmall
+                          ?.copyWith(fontSize: getProportionateScreenWidth(22)),
                     ),
                     TextField(
                       onChanged: (value) => _tstitle = value,
@@ -126,8 +131,8 @@ class _WalletScreenState extends State<WalletScreen> {
                           hintText: "${langs[lang]["wallet"]["title"]}"),
                       style: Theme.of(context)
                           .textTheme
-                          .headline4
-                          .copyWith(fontSize: getProportionateScreenWidth(22)),
+                          .headlineSmall
+                          ?.copyWith(fontSize: getProportionateScreenWidth(22)),
                     ),
                     TextField(
                       onChanged: (value) => _tsdescription = value,
@@ -136,8 +141,8 @@ class _WalletScreenState extends State<WalletScreen> {
                           hintText: "${langs[lang]["wallet"]["description"]}"),
                       style: Theme.of(context)
                           .textTheme
-                          .headline4
-                          .copyWith(fontSize: getProportionateScreenWidth(22)),
+                          .headlineSmall
+                          ?.copyWith(fontSize: getProportionateScreenWidth(22)),
                     ),
                     TextField(
                       onChanged: (value) =>
@@ -149,8 +154,8 @@ class _WalletScreenState extends State<WalletScreen> {
                           hintText: "${langs[lang]["wallet"]["amount"]}"),
                       style: Theme.of(context)
                           .textTheme
-                          .headline4
-                          .copyWith(fontSize: getProportionateScreenWidth(22)),
+                          .headlineSmall
+                          ?.copyWith(fontSize: getProportionateScreenWidth(22)),
                     ),
                     ElevatedButton(
                       style: TextButton.styleFrom(
@@ -163,7 +168,7 @@ class _WalletScreenState extends State<WalletScreen> {
                             date: DateTime.now(),
                             price: _amountofmoney,
                             title: _tstitle,
-                            description: _tsdescription);
+                            description: _tsdescription ?? 'unknown');
                         Navigator.pop(context);
                       },
                     )
@@ -189,7 +194,7 @@ class _WalletScreenState extends State<WalletScreen> {
                 children: [
                   Text(
                     "${langs[lang]["wallet"]["balance"]}",
-                    style: Theme.of(context).textTheme.headline4.copyWith(
+                    style: Theme.of(context).textTheme.headlineSmall?.copyWith(
                         color: Colors.white.withAlpha(240),
                         fontWeight: FontWeight.w300),
                     textAlign: TextAlign.center,
@@ -198,9 +203,12 @@ class _WalletScreenState extends State<WalletScreen> {
                     padding: const EdgeInsets.symmetric(horizontal: 16.0),
                     child: AutoSizeText(
                       "${NumberFormat.currency(symbol: currency).format(currentBalance)}",
-                      style: Theme.of(context).textTheme.headline4.copyWith(
-                          color: Colors.white,
-                          fontSize: getProportionateScreenWidth(42)),
+                      style: Theme.of(context)
+                          .textTheme
+                          .headlineSmall
+                          ?.copyWith(
+                              color: Colors.white,
+                              fontSize: getProportionateScreenWidth(42)),
                       textAlign: TextAlign.center,
                       maxLines: 1,
                     ),
@@ -212,8 +220,8 @@ class _WalletScreenState extends State<WalletScreen> {
                               "${langs[lang]["wallet"]["daily"]} ${widget.cigaratteManager.moneyPerSecond * 60 * 60 * 24} $currency",
                               style: Theme.of(context)
                                   .textTheme
-                                  .headline4
-                                  .copyWith(
+                                  .headlineSmall
+                                  ?.copyWith(
                                       color: Colors.white.withAlpha(200),
                                       fontWeight: FontWeight.w300,
                                       fontSize:
@@ -224,8 +232,8 @@ class _WalletScreenState extends State<WalletScreen> {
                               "${langs[lang]["wallet"]["weekly"]} ${widget.cigaratteManager.moneyPerSecond * 60 * 60 * 24 * 7} $currency",
                               style: Theme.of(context)
                                   .textTheme
-                                  .headline4
-                                  .copyWith(
+                                  .headlineSmall
+                                  ?.copyWith(
                                       color: Colors.white.withAlpha(200),
                                       fontWeight: FontWeight.w300,
                                       fontSize:
@@ -236,8 +244,8 @@ class _WalletScreenState extends State<WalletScreen> {
                               "${langs[lang]["wallet"]["monthly"]} ${widget.cigaratteManager.moneyPerSecond * 60 * 60 * 24 * 30} $currency",
                               style: Theme.of(context)
                                   .textTheme
-                                  .headline4
-                                  .copyWith(
+                                  .headlineSmall
+                                  ?.copyWith(
                                       color: Colors.white.withAlpha(200),
                                       fontWeight: FontWeight.w300,
                                       fontSize:
@@ -248,8 +256,8 @@ class _WalletScreenState extends State<WalletScreen> {
                               "${langs[lang]["wallet"]["yearly"]} ${widget.cigaratteManager.moneyPerSecond * 60 * 60 * 24 * 365} $currency",
                               style: Theme.of(context)
                                   .textTheme
-                                  .headline4
-                                  .copyWith(
+                                  .headlineSmall
+                                  ?.copyWith(
                                       color: Colors.white.withAlpha(200),
                                       fontWeight: FontWeight.w300,
                                       fontSize:
@@ -365,21 +373,21 @@ class _WalletScreenState extends State<WalletScreen> {
                                   item.title,
                                   style: Theme.of(context)
                                       .textTheme
-                                      .headline4
-                                      .copyWith(
+                                      .headlineSmall
+                                      ?.copyWith(
                                           color: Colors.white,
                                           fontSize:
                                               getProportionateScreenWidth(22)),
                                 ),
                                 if (item.description != null &&
                                     item.description != "" &&
-                                    item.description.length > 2)
+                                    item.description!.length > 2)
                                   Text(
                                     item.description ?? "",
                                     style: Theme.of(context)
                                         .textTheme
-                                        .headline4
-                                        .copyWith(
+                                        .headlineSmall
+                                        ?.copyWith(
                                             color: Colors.grey[100],
                                             fontSize:
                                                 getProportionateScreenWidth(
@@ -389,8 +397,8 @@ class _WalletScreenState extends State<WalletScreen> {
                                   DateFormat.yMMMMEEEEd().format(item.time),
                                   style: Theme.of(context)
                                       .textTheme
-                                      .headline4
-                                      .copyWith(
+                                      .headlineSmall
+                                      ?.copyWith(
                                           color: Colors.white70,
                                           fontSize:
                                               getProportionateScreenWidth(16)),
@@ -404,8 +412,8 @@ class _WalletScreenState extends State<WalletScreen> {
                                   "${NumberFormat.currency(symbol: currency).format(item.price)}",
                                   style: Theme.of(context)
                                       .textTheme
-                                      .headline4
-                                      .copyWith(
+                                      .headlineSmall
+                                      ?.copyWith(
                                           color: Colors.white,
                                           fontSize:
                                               getProportionateScreenWidth(25)),
@@ -450,7 +458,7 @@ class _WalletScreenState extends State<WalletScreen> {
           ),
           Text(
             "${langs[lang]["home"]["wallet"]}",
-            style: Theme.of(context).textTheme.bodyText2.copyWith(
+            style: Theme.of(context).textTheme.bodyMedium?.copyWith(
                 color: Colors.white, fontSize: getProportionateScreenWidth(26)),
           )
         ],
@@ -463,8 +471,15 @@ class Transaction {
   final double price;
   final DateTime time;
   final String title;
-  final String description;
+  final String? description;
+
   get toJson =>
       {"price": price, "time": time.toIso8601String(), "title": title};
-  Transaction({this.price, this.time, this.title, this.description = ""});
+
+  Transaction({
+    required this.price,
+    required this.time,
+    required this.title,
+    this.description = "",
+  });
 }
diff --git a/lib/screens/welcome_screen.dart b/lib/screens/welcome_screen.dart
index 01ee360..f1ae6c7 100644
--- a/lib/screens/welcome_screen.dart
+++ b/lib/screens/welcome_screen.dart
@@ -1,9 +1,7 @@
 import 'dart:convert';
-import 'dart:io';
 
 import 'package:avatar_glow/avatar_glow.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
 import 'package:intl/intl.dart';
 import 'package:quitsmoke/comps/getlang.dart';
 import 'package:quitsmoke/comps/snappable.dart';
@@ -15,7 +13,7 @@ import 'package:shared_preferences/shared_preferences.dart';
 import 'home_screen.dart';
 
 class WelcomeScreen extends StatefulWidget {
-  WelcomeScreen({Key key}) : super(key: key);
+  WelcomeScreen({Key? key}) : super(key: key);
 
   @override
   _WelcomeScreenState createState() => _WelcomeScreenState();
@@ -23,15 +21,15 @@ class WelcomeScreen extends StatefulWidget {
 
 class _WelcomeScreenState extends State<WelcomeScreen> {
   List<String> reason = [];
-  String currentReason;
+  late String currentReason;
   String lang = "";
   final myController = TextEditingController();
   final myController2 = TextEditingController();
   final myController3 = TextEditingController();
-  double pricePerCigaratte;
-  int dailycigarattes;
+  double? pricePerCigaratte;
+  int? dailycigarattes;
   int index = 0;
-  String currency;
+  String? currency;
   final snapKey = GlobalKey<SnappableState>();
 
   @override
@@ -42,23 +40,23 @@ class _WelcomeScreenState extends State<WelcomeScreen> {
   }
 
   bool starting = false;
+
   _startNow() async {
     if (pricePerCigaratte == null ||
         dailycigarattes == null ||
-        reason == null ||
         reason.length == 0 ||
         currency == null) return false;
     setState(() {
       starting = true;
     });
-    snapKey.currentState.snap();
+    snapKey.currentState?.snap();
 
     SharedPreferences pref = await SharedPreferences.getInstance();
     Future.delayed(Duration(seconds: 5), () {
-      pref.setString("startTime", stopDate.toIso8601String());
-      pref.setDouble("pricePerCigaratte", pricePerCigaratte);
-      pref.setInt("dailycigarattes", dailycigarattes);
-      pref.setString("currency", currency);
+      pref.setString("startTime", stopDate!.toIso8601String());
+      pref.setDouble("pricePerCigaratte", pricePerCigaratte!);
+      pref.setInt("dailycigarattes", dailycigarattes!);
+      pref.setString("currency", currency!);
       pref.setString("reason", jsonEncode(reason));
 
       Navigator.of(context).pushReplacement(
@@ -75,13 +73,13 @@ class _WelcomeScreenState extends State<WelcomeScreen> {
           child: Column(
             children: [
               Text(langs[lang]["welcome"]["welcometext"],
-                  style: Theme.of(context).textTheme.headline4,
+                  style: Theme.of(context).textTheme.headlineSmall,
                   textAlign: TextAlign.center,
                   textScaleFactor: 1),
               SizedBox(height: getProportionateScreenHeight(50)),
               Text(
                 langs[lang]["welcome"]["tellreason"],
-                style: Theme.of(context).textTheme.headline4.copyWith(
+                style: Theme.of(context).textTheme.headlineSmall?.copyWith(
                     fontSize: getProportionateScreenWidth(22),
                     color: Colors.black.withAlpha(150)),
                 textAlign: TextAlign.center,
@@ -101,8 +99,8 @@ class _WelcomeScreenState extends State<WelcomeScreen> {
                 children: [
                   TextButton(
                       onPressed: () {
-                        if (currentReason.trim() == "") return false;
-                        if (reason.contains(currentReason.trim())) return false;
+                        if (currentReason.trim() == "") return;
+                        if (reason.contains(currentReason.trim())) return;
                         reason.add(currentReason.trim());
                         currentReason = "";
                         myController.clear();
@@ -146,8 +144,8 @@ class _WelcomeScreenState extends State<WelcomeScreen> {
                 langs[lang]["welcome"]["weneedtoknow"],
                 style: Theme.of(context)
                     .textTheme
-                    .headline4
-                    .copyWith(fontSize: getProportionateScreenWidth(32)),
+                    .headlineSmall
+                    ?.copyWith(fontSize: getProportionateScreenWidth(32)),
                 textAlign: TextAlign.center,
               ),
               SizedBox(
@@ -196,8 +194,8 @@ class _WelcomeScreenState extends State<WelcomeScreen> {
                     langs[lang]["welcome"]["choosecurrency"],
                     style: Theme.of(context)
                         .textTheme
-                        .bodyText2
-                        .copyWith(fontSize: getProportionateScreenWidth(26)),
+                        .headlineSmall
+                        ?.copyWith(fontSize: getProportionateScreenWidth(26)),
                   ),
                   items: currencyList.map((Map value) {
                     return DropdownMenuItem<String>(
@@ -221,7 +219,7 @@ class _WelcomeScreenState extends State<WelcomeScreen> {
                     children: [
                       Text("${langs[lang]["settings"]["youstopped"]}"),
                       Text(
-                        "${DateFormat.yMMMMEEEEd().format(stopDate)}\n${DateFormat.Hms().format(stopDate)}",
+                        "${DateFormat.yMMMMEEEEd().format(stopDate!)}\n${DateFormat.Hms().format(stopDate!)}",
                         textAlign: TextAlign.center,
                       ),
                     ],
@@ -258,11 +256,8 @@ class _WelcomeScreenState extends State<WelcomeScreen> {
               if (!starting)
                 AvatarGlow(
                   glowColor: Colors.blue,
-                  endRadius: 180.0,
                   duration: Duration(milliseconds: 2000),
                   repeat: true,
-                  showTwoGlows: false,
-                  repeatPauseDuration: Duration(milliseconds: 100),
                   child: ElevatedButton(
                     child: Text(langs[lang]["welcome"]["start"]),
                     onPressed: () => _startNow(),
@@ -275,22 +270,22 @@ class _WelcomeScreenState extends State<WelcomeScreen> {
     return Container();
   }
 
-  DateTime stopDate;
+  DateTime? stopDate;
 
   _pickDate(BuildContext context) async {
-    DateTime date = await showDatePicker(
+    DateTime? date = await showDatePicker(
       context: context,
       firstDate: DateTime(DateTime.now().year - 5),
       lastDate: DateTime.now(),
-      initialDate: stopDate,
+      initialDate: stopDate ?? DateTime.now(),
     );
 
-    TimeOfDay t =
+    TimeOfDay? t =
         await showTimePicker(context: context, initialTime: TimeOfDay.now());
     if (date != null && t != null)
       setState(() {
         stopDate = date;
-        stopDate = stopDate.add(Duration(hours: t.hour, minutes: t.minute));
+        stopDate = stopDate?.add(Duration(hours: t.hour, minutes: t.minute));
       });
     print(stopDate);
   }
diff --git a/lib/size_config.dart b/lib/size_config.dart
index ed902f3..a0a8f27 100644
--- a/lib/size_config.dart
+++ b/lib/size_config.dart
@@ -1,12 +1,14 @@
 import 'package:flutter/material.dart';
 
 class SizeConfig {
-  static MediaQueryData _mediaQueryData;
-  static double screenWidth;
-  static double screenHeight;
-  static double defaultSize;
-  static double scaleFactor;
-  static Orientation orientation;
+  SizeConfig();
+
+  static late MediaQueryData _mediaQueryData;
+  static late double screenWidth;
+  static late double screenHeight;
+  static late double defaultSize;
+  static late double scaleFactor;
+  static late Orientation orientation;
 
   void init(BuildContext context) {
     _mediaQueryData = MediaQuery.of(context);
diff --git a/lib/theme.dart b/lib/theme.dart
index 14149db..6b383f5 100644
--- a/lib/theme.dart
+++ b/lib/theme.dart
@@ -8,23 +8,22 @@ ThemeData themeData(BuildContext context) {
   return ThemeData(
     appBarTheme: appBarTheme,
     primaryColor: kPrimaryColor,
-    accentColor: kAccentLightColor,
+    hintColor: kAccentLightColor,
     scaffoldBackgroundColor: Colors.white,
     colorScheme: ColorScheme.light(
       secondary: kSecondaryLightColor,
       // on light theme surface = Colors.white by default
     ),
-    backgroundColor: Colors.white,
+    primaryColorLight: Colors.white,
     iconTheme: IconThemeData(color: kBodyTextColorLight),
-    accentIconTheme: IconThemeData(color: kAccentIconLightColor),
     primaryIconTheme: IconThemeData(color: kPrimaryIconLightColor),
     textTheme: GoogleFonts.quicksandTextTheme().copyWith(
-      bodyText1: GoogleFonts.quicksand().copyWith(color: kBodyTextColorLight),
-      bodyText2: GoogleFonts.quicksand()
+      bodyLarge: GoogleFonts.quicksand().copyWith(color: kBodyTextColorLight),
+      bodyMedium: GoogleFonts.quicksand()
           .copyWith(color: kBodyTextColorLight, fontWeight: FontWeight.bold),
-      headline4: GoogleFonts.quicksand()
+      headlineMedium: GoogleFonts.quicksand()
           .copyWith(color: kTitleTextLightColor, fontSize: 32),
-      headline1: GoogleFonts.quicksand()
+      displayLarge: GoogleFonts.quicksand()
           .copyWith(color: kTitleTextLightColor, fontSize: 80),
     ),
   );
@@ -34,22 +33,21 @@ ThemeData themeData(BuildContext context) {
 ThemeData darkThemeData(BuildContext context) {
   return ThemeData.dark().copyWith(
     primaryColor: kPrimaryColor,
-    accentColor: kAccentDarkColor,
+    hintColor: kAccentDarkColor,
     scaffoldBackgroundColor: Color(0xFF0D0C0E),
     appBarTheme: appBarTheme,
     colorScheme: ColorScheme.light(
       secondary: kSecondaryDarkColor,
       surface: kSurfaceDarkColor,
     ),
-    backgroundColor: kBackgroundDarkColor,
+    primaryColorLight: kBackgroundDarkColor,
     iconTheme: IconThemeData(color: kBodyTextColorDark),
-    accentIconTheme: IconThemeData(color: kAccentIconDarkColor),
     primaryIconTheme: IconThemeData(color: kPrimaryIconDarkColor),
     textTheme: GoogleFonts.latoTextTheme().copyWith(
-      bodyText1: TextStyle(color: kBodyTextColorDark),
-      bodyText2: TextStyle(color: kBodyTextColorDark),
-      headline4: TextStyle(color: kTitleTextDarkColor, fontSize: 32),
-      headline1: TextStyle(color: kTitleTextDarkColor, fontSize: 80),
+      bodyLarge: TextStyle(color: kBodyTextColorDark),
+      bodyMedium: TextStyle(color: kBodyTextColorDark),
+      headlineMedium: TextStyle(color: kTitleTextDarkColor, fontSize: 32),
+      displayLarge: TextStyle(color: kTitleTextDarkColor, fontSize: 80),
     ),
   );
 }
diff --git a/pubspec.yaml b/pubspec.yaml
index e27b3f4..be69f17 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -15,10 +15,10 @@ publish_to: "none" # Remove this line if you wish to publish to pub.dev
 # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
 # Read more about iOS versioning at
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
-version: 0.1.1+11
+version: 0.2.0
 
 environment:
-  sdk: ">=2.7.0 <3.0.0"
+  sdk: ">=2.12.0 <=3.0.6"
 
 dependencies:
   flutter:
@@ -26,18 +26,17 @@ dependencies:
 
   # The following adds the Cupertino Icons font to your application.
   # Use with the CupertinoIcons class for iOS style icons.
-  cupertino_icons: ^1.0.3
-  google_fonts: ^2.1.0 # it helps us to use google fonts on our app
-  flutter_svg: ^0.22.0 # it helps us to use SVG in our app
+  cupertino_icons: ^1.0.6
+  google_fonts: ^6.1.0 # it helps us to use google fonts on our app
+  flutter_svg: ^2.0.9 # it helps us to use SVG in our app
   provider: ^5.0.0 # Our state management package
-  shared_preferences: ^2.0.6
-  auto_size_text: ^3.0.0-nullsafety.0
-  intl: ^0.17.0
-  avatar_glow: ^2.0.1
-  flutter_local_notifications: ^6.0.0
-  timezone: ^0.7.0
-  flutter_native_timezone: ^1.1.0
-  image: ^3.0.2
+  shared_preferences: ^2.2.2
+  auto_size_text: ^3.0.0
+  intl: ^0.19.0
+  avatar_glow: ^3.0.1
+  flutter_local_notifications: ^16.3.2
+  timezone: ^0.9.2
+  image: ^4.1.7
 
 dev_dependencies:
   flutter_test:
@@ -56,6 +55,7 @@ flutter:
   # To add assets to your application, add an assets section, like this:
   assets:
     - assets/images/
+    - assets/ok/
   #   - images/a_dot_ham.jpeg
   # An image asset can refer to one or more resolution-specific "variants", see
   # https://flutter.dev/assets-and-images/#resolution-aware.