Merge branch 'main' of github.com:Ninad7n/AppLockFlutter

README.md

@@ -2,7 +2,7 @@
 
 app_lock_flutter
 
-- This a applock application based on flutter and it is only for Android.
+- This is a applock application based on flutter and it is only for Android.
 - app_lock_flutter depends on method channels to trigger background services in MainActivity.kt, also uses Getx state management.
 - it uses USAGE_STATS to trigger application activities.
 

android/build.gradle

@@ -26,6 +26,6 @@ subprojects {
     project.evaluationDependsOn(':app')
 }
 
-task clean(type: Delete) {
+tasks.register("clean", Delete) {
     delete rootProject.buildDir
 }

lib/services/constant.dart

@@ -6,8 +6,6 @@ import 'package:intl/intl.dart';
 import 'package:url_launcher/url_launcher.dart';
 import 'package:html/parser.dart';
 
-///Extensions
-
 extension CapExtension on String {
   String get inCaps =>
       length > 0 ? '${this[0].toUpperCase()}${substring(1)}' : '';
@@ -111,7 +109,6 @@ String getStringFromList(var data) {
     // log(toReturn);
     toReturn = toReturn.substring(0, toReturn.length - 2);
     // log(toReturn);
-
   } else {
     toReturn = data.first.name;
   }

lib/services/themes.dart

@@ -29,16 +29,13 @@ class CustomTheme {
     useMaterial3: true,
     scaffoldBackgroundColor: backgroundDark,
     hintColor: Colors.grey[200],
-    primarySwatch: colorCustom,
     canvasColor: secondaryColor,
     // primaryColorLight: secondaryColor,
     splashColor: secondaryColor,
     shadowColor: Colors.grey[600],
-    backgroundColor: backgroundDark,
     cardColor: const Color(0xFFFFFFFF),
     primaryColor: primaryColor,
     dividerColor: const Color(0xFF2A2A2A),
-    errorColor: const Color(0xFFCF6679),
     primaryColorDark: secondaryColor,
 
     // iconTheme: IconThemeData(color: Colors.grey[500]),
@@ -84,5 +81,8 @@ class CustomTheme {
       headline5: GoogleFonts.epilogue(),
       headline6: GoogleFonts.epilogue(),
     ),
+    colorScheme: ColorScheme.fromSwatch(primarySwatch: colorCustom)
+        .copyWith(background: backgroundDark)
+        .copyWith(error: const Color(0xFFCF6679)),
   );
 }