Mobile Screen 88, 89, 90

.gitignore

@@ -18,7 +18,7 @@
 # The .vscode folder contains launch configuration and tasks you configure in
 # VS Code which you may wish to be included in version control, so this line
 # is commented out by default.
-#.vscode/
+.vscode/
 
 # Flutter/Dart/Pub related
 **/doc/api/
@@ -46,3 +46,4 @@ app.*.map.json
 /android/app/release
 
 /lib/gen/
+

.vscode/settings.json

@@ -1,3 +1,3 @@
 {
-    "dart.flutterSdkPath": "/Users/user/fvm/versions/3.7.12"
+
 }

README.md

@@ -122,13 +122,13 @@ flutter build apk
 | ---------------------------------------------------- | ---------------------------------------------------- | ---------------------------------------------------- | ---------------------------------------------------- |
 | <img src="art/screenshots/page_81.png" width="200"/> | <img src="art/screenshots/page_82.png" width="200"/> | <img src="art/screenshots/page_83.png" width="200"/> | <img src="art/screenshots/page_84.png" width="200"/> |
 
-| Page 85                                              | Page 86                                              | Page 87                                              | Page 88 |
-| ---------------------------------------------------- | ---------------------------------------------------- | ---------------------------------------------------- | ------- |
-| <img src="art/screenshots/page_85.png" width="200"/> | <img src="art/screenshots/page_86.png" width="200"/> | <img src="art/screenshots/page_87.png" width="200"/> |         |
+| Page 85                                              | Page 86                                              | Page 87                                              | Page 88                                              |
+| ---------------------------------------------------- | ---------------------------------------------------- | ---------------------------------------------------- | ---------------------------------------------------- |
+| <img src="art/screenshots/page_85.png" width="200"/> | <img src="art/screenshots/page_86.png" width="200"/> | <img src="art/screenshots/page_87.png" width="200"/> | <img src="art/screenshots/page_88.png" width="200"/> |
 
-| Page 89 | Page 90 | Page 91 | Page 92 |
-| ------- | ------- | ------- | ------- |
-|         |         |         |         |
+| Page 89                                              | Page 90                                              | Page 91 | Page 92 |
+| ---------------------------------------------------- | ---------------------------------------------------- | ------- | ------- |
+| <img src="art/screenshots/page_89.png" width="200"/> | <img src="art/screenshots/page_90.png" width="200"/> |         |         |
 
 | Page 93 | Page 94 | Page 95 | Page 96 |
 | ------- | ------- | ------- | ------- |

lib/src/mobile_ui/10/page_10.dart

@@ -9,7 +9,7 @@ class Page10 extends StatefulWidget {
   const Page10({Key? key}) : super(key: key);
 
   @override
-  _Page10State createState() => _Page10State();
+  State<Page10> createState() => _Page10State();
 }
 
 class _Page10State extends State<Page10> {
@@ -31,7 +31,8 @@ class _Page10State extends State<Page10> {
           // crossAxisAlignment: CrossAxisAlignment.stretch,
           children: [
             Padding(
-              padding: EdgeInsets.only(left: 53.w, right: 56.w, top: 35.h, bottom: 57.h),
+              padding: EdgeInsets.only(
+                  left: 53.w, right: 56.w, top: 35.h, bottom: 57.h),
               child: Column(
                 mainAxisAlignment: MainAxisAlignment.start,
                 crossAxisAlignment: CrossAxisAlignment.center,
@@ -174,12 +175,13 @@ class _Page10State extends State<Page10> {
                     children: [
                       TextButton(
                         style: TextButton.styleFrom(
-                          primary: Colors.white,
+                          foregroundColor: Colors.white,
                           backgroundColor: const Color(0xffD0D0D0),
                         ),
                         onPressed: () {},
                         child: Padding(
-                          padding: EdgeInsets.symmetric(horizontal: 8.w, vertical: 6.h),
+                          padding: EdgeInsets.symmetric(
+                              horizontal: 8.w, vertical: 6.h),
                           child: Text(
                             'Follow',
                             style: GoogleFonts.workSans(
@@ -195,12 +197,13 @@ class _Page10State extends State<Page10> {
                       ),
                       TextButton(
                         style: TextButton.styleFrom(
-                          primary: Colors.white,
+                          foregroundColor: Colors.white,
                           backgroundColor: const Color(0xffD0D0D0),
                         ),
                         onPressed: () {},
                         child: Padding(
-                          padding: EdgeInsets.symmetric(horizontal: 8.w, vertical: 6.h),
+                          padding: EdgeInsets.symmetric(
+                              horizontal: 8.w, vertical: 6.h),
                           child: Text(
                             'Message',
                             style: GoogleFonts.workSans(

lib/src/mobile_ui/11/page_11.dart

@@ -8,7 +8,7 @@ class Page11 extends StatefulWidget {
   const Page11({Key? key}) : super(key: key);
 
   @override
-  _Page11State createState() => _Page11State();
+  State<Page11> createState() => _Page11State();
 }
 
 class _Page11State extends State<Page11> {

lib/src/mobile_ui/12/page_12.dart

@@ -8,7 +8,7 @@ class Page12 extends StatefulWidget {
   const Page12({Key? key}) : super(key: key);
 
   @override
-  _Page12State createState() => _Page12State();
+  State<Page12> createState() => _Page12State();
 }
 
 class _Page12State extends State<Page12> {

lib/src/mobile_ui/13/page_13.dart

@@ -7,7 +7,7 @@ class Page13 extends StatefulWidget {
   const Page13({Key? key}) : super(key: key);
 
   @override
-  _Page13State createState() => _Page13State();
+  State<Page13> createState() => _Page13State();
 }
 
 class _Page13State extends State<Page13> {

lib/src/mobile_ui/14/page_14.dart

@@ -8,7 +8,7 @@ class Page14 extends StatefulWidget {
   const Page14({Key? key}) : super(key: key);
 
   @override
-  _Page14State createState() => _Page14State();
+  State<Page14> createState() => _Page14State();
 }
 
 class _Page14State extends State<Page14> {
@@ -95,7 +95,7 @@ class _Page14State extends State<Page14> {
           context.pop();
         },
         style: ElevatedButton.styleFrom(
-          primary: isTransparent ? Colors.transparent : const Color(0xFF0043CE),
+          backgroundColor: isTransparent ? Colors.transparent : const Color(0xFF0043CE),
           elevation: 0,
           shadowColor: Colors.transparent,
           fixedSize: Size(342.w, 64.h),

lib/src/mobile_ui/15/page_15.dart

@@ -6,7 +6,7 @@ class Page15 extends StatefulWidget {
   const Page15({Key? key}) : super(key: key);
 
   @override
-  _Page15State createState() => _Page15State();
+  State<Page15> createState() => _Page15State();
 }
 
 class _Page15State extends State<Page15> {
@@ -105,7 +105,7 @@ class _Page15State extends State<Page15> {
                     context.pop();
                   },
                   style: ElevatedButton.styleFrom(
-                    primary: const Color(0xFF161616),
+                    backgroundColor: const Color(0xFF161616),
                     elevation: 0,
                     shadowColor: Colors.transparent,
                     fixedSize: Size(342, 54),

lib/src/mobile_ui/16/page16.dart

@@ -105,7 +105,7 @@ class Page16 extends StatelessWidget {
                     context.pop();
                   },
                   style: ElevatedButton.styleFrom(
-                    primary: const Color(0xFF161616),
+                    backgroundColor: const Color(0xFF161616),
                     elevation: 0,
                     shadowColor: Colors.transparent,
                     fixedSize: Size(325.w, 50.h),

lib/src/mobile_ui/17/page_17.dart

@@ -7,7 +7,7 @@ class Page17 extends StatefulWidget {
   const Page17({Key? key}) : super(key: key);
 
   @override
-  _Page17State createState() => _Page17State();
+  State<Page17>  createState() => _Page17State();
 }
 
 class _Page17State extends State<Page17> {
@@ -58,7 +58,7 @@ class _Page17State extends State<Page17> {
                 context.pop();
               },
               style: ElevatedButton.styleFrom(
-                primary: const Color(0xFF161616),
+                backgroundColor: const Color(0xFF161616),
                 elevation: 0,
                 shadowColor: Colors.transparent,
                 fixedSize: Size(342, 54),

lib/src/mobile_ui/2/page2.dart

@@ -267,7 +267,7 @@ class Page2 extends StatelessWidget {
     );
   }
 
-  _buildChat({required MessageModel chat, required bool showProfileBox}) {
+  Container _buildChat({required MessageModel chat, required bool showProfileBox}) {
     return chat.isRight
         ? Container(
             margin: EdgeInsets.only(bottom: 42.h),

lib/src/mobile_ui/21/page_21.dart

@@ -113,7 +113,7 @@ class _Page21State extends State<Page21> {
                     context.pop();
                   },
                   style: ElevatedButton.styleFrom(
-                    primary: const Color(0xFF161616),
+                    backgroundColor: const Color(0xFF161616),
                     elevation: 0,
                     shadowColor: Colors.transparent,
                     fixedSize: Size(342, 48),

lib/src/mobile_ui/22/page_22.dart

@@ -146,8 +146,7 @@ class _Page22State extends State<Page22> {
                       side: const BorderSide(
                         width: 1,
                         color: Color(0xff000000),
-                      ),
-                      primary: const Color(0xFFFFFFFF),
+                      ), backgroundColor: const Color(0xFFFFFFFF),
                       elevation: 0,
                       shadowColor: Colors.transparent,
                       fixedSize: Size(342, 54),

lib/src/mobile_ui/24/page_24.dart

@@ -86,7 +86,7 @@ class _Page24State extends State<Page24> {
                 ),
               ),
               SizedBox(height: 20.h),
-              Container(
+              SizedBox(
                 height: 80.w,
                 width: size.width,
                 child: SingleChildScrollView(
@@ -199,7 +199,7 @@ class _Page24State extends State<Page24> {
                 ),
               ),
               SizedBox(height: 10.h),
-              Container(
+              SizedBox(
                 width: size.width,
                 height: 230,
                 child: SingleChildScrollView(

lib/src/mobile_ui/25/page_25.dart

@@ -79,7 +79,7 @@ class _Page25State extends State<Page25> {
               SizedBox(
                 height: 13.h,
               ),
-              Container(
+              SizedBox(
                 height: 80.h,
                 width: size.width,
                 child: SingleChildScrollView(

lib/src/mobile_ui/26/page26.dart

@@ -93,7 +93,7 @@ class _Page26State extends State<Page26> {
               SizedBox(
                 height: 20.h,
               ),
-              Container(
+              SizedBox(
                 height: 180.h,
                 width: size.width,
                 child: SingleChildScrollView(
@@ -195,7 +195,7 @@ class GroupTaskCard extends StatelessWidget {
           mainAxisAlignment: MainAxisAlignment.spaceEvenly,
           children: [
             SizedBox(height: 5.h),
-            Container(
+            SizedBox(
               width: 100.w,
               child: Stack(
                 children: [

lib/src/mobile_ui/28/page_28.dart

@@ -70,7 +70,7 @@ class _Page28State extends State<Page28> {
                 ),
               ),
               SizedBox(height: 20.h),
-              Container(
+              SizedBox(
                 height: 90.h,
                 width: size.width,
                 child: SingleChildScrollView(
@@ -246,7 +246,7 @@ class _Page28State extends State<Page28> {
                     SizedBox(width: 10.w),
                     Expanded(
                       flex: 2,
-                      child: Container(
+                      child: SizedBox(
                         // color: Colors.grey,
                         child: Column(
                           children: [

lib/src/mobile_ui/29/page_29.dart

@@ -110,7 +110,7 @@ class _Page29State extends State<Page29> {
                   ),
                 ],
               ),
-              Container(
+              SizedBox(
                 height: 40.0,
                 child: Row(
                   children: [
@@ -188,8 +188,8 @@ class _Page29State extends State<Page29> {
     );
   }
 
-  _buildCategories() {
-    return Container(
+  Widget _buildCategories() {
+    return SizedBox(
       height: 80.0.h,
       child: ListView.builder(
         itemCount: categoryArraylist.length,
@@ -222,7 +222,7 @@ class _Page29State extends State<Page29> {
     );
   }
 
-  _buildSearchAndFilterWidget() {
+  Row _buildSearchAndFilterWidget() {
     return Row(
       mainAxisAlignment: MainAxisAlignment.spaceBetween,
       children: [
@@ -277,7 +277,7 @@ class _Page29State extends State<Page29> {
     );
   }
 
-  _buildFoodImage() {
+  ClipRRect _buildFoodImage() {
     return ClipRRect(
       borderRadius: BorderRadius.circular(10.0),
       child: Stack(
@@ -353,7 +353,7 @@ class _Page29State extends State<Page29> {
     );
   }
 
-  _bottomNavBar() {
+  Container _bottomNavBar() {
     return Container(
       height: 90.h,
       decoration: BoxDecoration(

lib/src/mobile_ui/30/page_30.dart

@@ -268,7 +268,7 @@ class _Page30State extends State<Page30> {
     );
   }
 
-  _bottomNavBar() {
+  Container _bottomNavBar() {
     return Container(
       height: 90.h,
       decoration: BoxDecoration(

lib/src/mobile_ui/34/page_34.dart

@@ -1,4 +1,3 @@
-import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:flutter_ui_kit_obkm/gen/colors.gen.dart';

lib/src/mobile_ui/35/widgets/nearby_event.dart

@@ -84,7 +84,7 @@ class NearbyEvent extends StatelessWidget {
 }
 
 class _ListItem extends StatelessWidget {
-  const _ListItem({super.key});
+  const _ListItem();
 
   @override
   Widget build(BuildContext context) {

lib/src/mobile_ui/38/page_38.dart

@@ -87,7 +87,7 @@ class Page38 extends StatelessWidget {
                 ),
                 Container(
                   height: 210.h,
-                  color: Color(0xffC4C4C4C4),
+                  color: Color(0xffc4c4c4),
                 ),
                 SizedBox(
                   height: 24.h,

lib/src/mobile_ui/4/page4.dart

@@ -8,7 +8,7 @@ class Page4 extends StatefulWidget {
   const Page4({Key? key}) : super(key: key);
 
   @override
-  _Page4State createState() => _Page4State();
+  State<Page4> createState() => _Page4State();
 }
 
 class _Page4State extends State<Page4> {

lib/src/mobile_ui/42/page_42.dart

@@ -375,7 +375,7 @@ class _Page42State extends State<Page42> {
                   height: 40.r,
                   width: 40.r,
                   fit: BoxFit.fill,
-                  color: Colors.white,
+                  colorFilter: ColorFilter.mode(Colors.white, BlendMode.srcIn),
                 ),
               ),
             ),