fix(lints): always_declare_return_types and prefer_if_elements_to_con…

analysis_options.yaml

@@ -24,16 +24,12 @@ linter:
 
     leading_newlines_in_multiline_strings: false
 
-    always_declare_return_types: false
-
     type_annotate_public_apis: false
     #always_use_package_imports to make a quick navigation to particular files
     always_use_package_imports: true
 
     directives_ordering: false
 
-    prefer_if_elements_to_conditional_expressions: false
-
     avoid_function_literals_in_foreach_calls: false
 
     join_return_with_assignment: false

lib/ui/components/cv_header.dart

@@ -22,26 +22,22 @@ class CVHeader extends StatelessWidget {
               ),
           textAlign: TextAlign.center,
         ),
-        subtitle != null
-            ? Text(
+        if (subtitle != null) Text(
                 subtitle,
                 style: Theme.of(context).textTheme.subtitle1.copyWith(
                       fontWeight: FontWeight.bold,
                       color: CVTheme.textColor(context),
                     ),
                 textAlign: TextAlign.center,
-              )
-            : Container(),
-        description != null
-            ? Container(
+              ) else Container(),
+        if (description != null) Container(
                 padding: const EdgeInsets.symmetric(vertical: 16),
                 child: Text(
                   description,
                   style: Theme.of(context).textTheme.subtitle1,
                   textAlign: TextAlign.center,
                 ),
-              )
-            : Container(),
+              ) else Container(),
       ],
     );
   }

lib/ui/components/cv_subheader.dart

@@ -19,16 +19,14 @@ class CVSubheader extends StatelessWidget {
               ),
           textAlign: TextAlign.center,
         ),
-        subtitle != null
-            ? Text(
+        if (subtitle != null) Text(
                 subtitle,
                 style: Theme.of(context).textTheme.subtitle1.copyWith(
                       fontWeight: FontWeight.w400,
                       color: CVTheme.textColor(context),
                     ),
                 textAlign: TextAlign.center,
-              )
-            : Container(),
+              ) else Container(),
       ],
     );
   }

lib/ui/components/cv_typeahead_field.dart

@@ -88,11 +88,11 @@ class CVTypeAheadField extends StatelessWidget {
                 }
                 //// If there is need of some other API Fetch add another if condition
                 return [
-                  pattern == '' ? 'No suggestions found' : pattern,
+                  if (pattern == '') 'No suggestions found' else pattern,
                 ];
               } catch (e) {
                 return [
-                  pattern == '' ? 'No suggestions found' : pattern,
+                  if (pattern == '') 'No suggestions found' else pattern,
                 ];
               }
             },

lib/ui/views/about/about_privacy_policy_view.dart

@@ -58,16 +58,14 @@ class AboutPrivacyPolicyView extends StatelessWidget {
     return Column(
       crossAxisAlignment: CrossAxisAlignment.start,
       children: [
-        title != ''
-            ? Text(
+        if (title != '') Text(
                 title,
                 style: style.copyWith(
                   fontWeight: FontWeight.w400,
                   color: CVTheme.primaryHeading(context),
                 ),
                 textAlign: TextAlign.left,
-              )
-            : Container(),
+              ) else Container(),
         RichText(
           textAlign: TextAlign.justify,
           text: TextSpan(

lib/ui/views/cv_landing_view.dart

@@ -174,8 +174,7 @@ class _CVLandingViewState extends State<CVLandingView> {
                   iconData: Icons.account_balance,
                 ),
               ),
-              _model.isLoggedIn
-                  ? Theme(
+              if (_model.isLoggedIn) Theme(
                       data: CVTheme.themeData(context),
                       child: ExpansionTile(
                         maintainState: true,
@@ -209,8 +208,7 @@ class _CVLandingViewState extends State<CVLandingView> {
                           ),
                         ],
                       ),
-                    )
-                  : InkWell(
+                    ) else InkWell(
                       onTap: () => Get.offAndToNamed(LoginView.id),
                       child: CVDrawerTile(
                         title: AppLocalizations.of(context).login,

lib/ui/views/groups/add_assignment_view.dart

@@ -268,7 +268,7 @@ class _AddAssignmentViewState extends State<AddAssignmentView> {
                 _buildDeadlineInput(),
                 _buildGradingScaleDropdown(),
                 _buildRestrictionsHeader(),
-                _isRestrictionEnabled ? _buildRestrictions() : Container(),
+                if (_isRestrictionEnabled) _buildRestrictions() else Container(),
                 _buildCreateButton(),
               ],
             ),

lib/ui/views/groups/components/member_card.dart

@@ -50,13 +50,11 @@ class MemberCard extends StatelessWidget {
               ],
             ),
           ),
-          hasMentorAccess
-              ? IconButton(
+          if (hasMentorAccess) IconButton(
                   icon: Icon(Icons.delete_outline),
                   color: CVTheme.red,
                   onPressed: onDeletePressed,
-                )
-              : Container()
+                ) else Container()
         ],
       ),
     );

lib/ui/views/groups/update_assignment_view.dart

@@ -239,7 +239,7 @@ class _UpdateAssignmentViewState extends State<UpdateAssignmentView> {
                 _buildDescriptionInput(),
                 _buildDeadlineInput(),
                 _buildRestrictionsHeader(),
-                _isRestrictionEnabled ? _buildRestrictions() : Container(),
+                if (_isRestrictionEnabled) _buildRestrictions() else Container(),
                 _buildUpdateButton(),
               ],
             ),

lib/ui/views/ib/components/ib_pop_quiz_button.dart

@@ -61,8 +61,7 @@ class IbPopQuizButtonState extends State<IbPopQuizButton> {
               widget.content,
               style: TextStyle(color: _getTextColor(), fontSize: 16),
             ),
-            _isPressed
-                ? Container(
+            if (_isPressed) Container(
                     height: 19,
                     width: 19,
                     decoration: BoxDecoration(
@@ -75,8 +74,7 @@ class IbPopQuizButtonState extends State<IbPopQuizButton> {
                       size: 16,
                       color: _getBorderColor(),
                     ),
-                  )
-                : Container(),
+                  ) else Container(),
           ],
         ),
       ),

lib/ui/views/ib/ib_landing_view.dart

@@ -159,13 +159,11 @@ class _IbLandingViewState extends State<IbLandingView> {
                       : IbTheme.textColor(context),
                 ),
               ),
-              !_model.isSuccess(_model.IB_FETCH_CHAPTERS)
-                  ? InkWell(
+              if (!_model.isSuccess(_model.IB_FETCH_CHAPTERS)) InkWell(
                       child: CVDrawerTile(
                         title: 'Loading...',
                       ),
-                    )
-                  : _buildChapters(_model.chapters),
+                    ) else _buildChapters(_model.chapters),
             ],
           ),
           Positioned(

lib/ui/views/ib/ib_page_view.dart

@@ -461,15 +461,13 @@ class _IbPageViewState extends State<IbPageView> {
                 ),
               ),
             ),
-            widget.chapter.prev != null || widget.chapter.next != null
-                ? Align(
+            if (widget.chapter.prev != null || widget.chapter.next != null) Align(
                     alignment: Alignment.bottomCenter,
                     child: Padding(
                       padding: const EdgeInsets.all(16.0),
                       child: _buildFloatingActionButtons(),
                     ),
-                  )
-                : Container(),
+                  ) else Container(),
           ],
         );
       },