Merge pull request 'dev' (#11) from dev into master

Reviewed-on: #11

api/3rd_party/neat_cache/lib/src/providers/redis.dart

@@ -178,6 +178,7 @@ class RedisCacheProvider extends CacheProvider<List<int>> {
 
         // Force close the client
         scheduleMicrotask(() => client.close(force: true));
+        return null;
       });
 
   @override

api/lib/src/models/scheme.dart

@@ -89,7 +89,7 @@ abstract class _SimpleSchemeTransMetaData {
 
   int? get likes;
 
-  bool? get liked;
+  bool get liked;
 }
 
 SimpleSchemeTransMetaData transSimpleSchemeMetaData(SimpleScheme scheme) => SimpleSchemeTransMetaData(
@@ -98,7 +98,7 @@ SimpleSchemeTransMetaData transSimpleSchemeMetaData(SimpleScheme scheme) => Simp
       uuid: scheme.uuid,
       name: scheme.name,
       shared: scheme.shared,
-      liked: scheme.liked,
+      liked: scheme.liked ?? false,
       likes: scheme.metadata?['likes'] ?? 0,
       downloads: scheme.metadata?['downloads'] ?? 0,
     );

api/start.sh

@@ -5,4 +5,5 @@ docker-compose up -d
 MIGRATION_IMAGE="$(docker image ls --filter label=stage=dart_builder -q)"
 docker run --name=dgm_api_migrate --network dgm_api_default "$MIGRATION_IMAGE"
 docker rm "$(docker ps -a --filter name=dgm_api_migrate -q)"
-docker image prune -f --filter label=stage=dart_builder
+docker image prune -f --filter label=stage=dart_builder
+docker image prune -f

app/lib/models/local_schemes_web.dart

@@ -36,6 +36,7 @@ class LocalSchemes implements LocalSchemesInterface<LocalSchemeEntryWeb> {
             }
             return entry;
           }
+          return null;
         })
         .where((e) => e != null)
         .cast<LocalSchemeEntryWeb>()

app/lib/widgets/login.dart

@@ -63,6 +63,7 @@ class _LoginWidgetState extends State<LoginWidget> {
                   else
                     throw e;
                 }
+                return null;
               },
               onSubmitAnimationCompleted: () {
                 var token = H().sp.getString(SPKeys.accessToken);
@@ -75,7 +76,7 @@ class _LoginWidgetState extends State<LoginWidget> {
                       .read<ConfigsProvider>()
                       .setProps(accessToken: token, email: H().sp.getString(SPKeys.loginEmail));
               },
-              onRecoverPassword: (_) {},
+              onRecoverPassword: (_) => null,
               hideForgotPasswordButton: true,
               disableCustomPageTransformer: true,
               messages: LoginMessages(
@@ -87,11 +88,13 @@ class _LoginWidgetState extends State<LoginWidget> {
                 if (FlutterLogin.defaultEmailValidator(value) != null) {
                   return LocaleKeys.me_login_email_error_hint.tr();
                 }
+                return null;
               },
               passwordValidator: (value) {
                 if (value!.isEmpty || value.length < 8 || value.length > 16) {
                   return LocaleKeys.me_login_password_hint.tr();
                 }
+                return null;
               },
               theme: LoginTheme(
                 pageColorDark: Colors.transparent,

app/lib/widgets/me.dart

@@ -114,7 +114,7 @@ class _MeWidgetState extends State<MeWidget> {
                               if (mounted && value != null)
                                 setState(() {
                                   _schemes = value;
-                                  _selected = value.first.uuid;
+                                  _selected = value.isEmpty ? null : value.first.uuid;
                                 });
                             });
                           },
@@ -261,7 +261,7 @@ class _MeWidgetState extends State<MeWidget> {
                 DButton.like(
                   enabled: true,
                   onTap: () {
-                    Api.likeScheme(schemeId: currentSelectedScheme!.uuid!, isLike: !currentSelectedScheme.liked!)
+                    Api.likeScheme(schemeId: currentSelectedScheme!.uuid!, isLike: !currentSelectedScheme.liked)
                         .then((value) {
                       if (value) {
                         _refreshList();