Updates

bukunmialuko · Nov 19, 2022 · be1524e · be1524e
1 parent dc84886
commit be1524e
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 25 deletions.
diff --git a/lib/src/mobile_ui/175/page_175.dart b/lib/src/mobile_ui/175/page_175.dart
@@ -2,10 +2,17 @@ import 'dart:io';
 
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
-import 'package:flutter_svg/flutter_svg.dart';
+import 'package:flutter_ui_kit_obkm/gen/assets.gen.dart';
 import 'package:flutter_ui_kit_obkm/gen/fonts.gen.dart';
+import 'package:flutter_ui_kit_obkm/src/navigation/navigation_service.dart';
+import 'package:get_it/get_it.dart';
 
-const _page175List = ["assets/png/175/002.png", "assets/png/175/003.png", "assets/png/175/004.png"];
+var _page175List = [
+  Assets.png.m175.img1.path,
+  Assets.png.m175.img2.path,
+  Assets.png.m175.img3.path,
+  Assets.png.m175.img4.path
+];
 
 class Page175 extends StatelessWidget {
   const Page175({Key? key}) : super(key: key);
@@ -22,11 +29,15 @@ class Page175 extends StatelessWidget {
         titleSpacing: 8.w,
         leading: Padding(
           padding: EdgeInsets.only(left: 8.w),
-          child: Center(
-            child: SvgPicture.asset(
-              "assets/svg/175/keyboard_arrow_left.svg",
-              width: 24.w,
-              height: 24.w,
+          child: GestureDetector(
+            onTap: () {
+              GetIt.I.get<NavigationService>().back();
+            },
+            child: Center(
+              child: Assets.svg.m175.keyboardArrowLeft.svg(
+                width: 24.w,
+                height: 24.w,
+              ),
             ),
           ),
         ),
@@ -42,18 +53,21 @@ class Page175 extends StatelessWidget {
           textAlign: TextAlign.center,
         ),
         actions: [
-          Padding(
-            padding: EdgeInsets.only(right: 12.w),
-            child: SvgPicture.asset(
-              "assets/svg/175/search.svg",
-              width: 24.w,
-              height: 24.w,
+          GestureDetector(
+            onTap: () {
+              GetIt.I.get<NavigationService>().back();
+            },
+            child: Padding(
+              padding: EdgeInsets.only(right: 12.w),
+              child: Assets.svg.m175.keyboardArrowLeft.svg(
+                width: 24.w,
+                height: 24.w,
+              ),
             ),
           ),
           Padding(
             padding: EdgeInsets.only(right: 12.w),
-            child: SvgPicture.asset(
-              "assets/svg/175/shopping_bag.svg",
+            child: Assets.svg.m175.shoppingBag.svg(
               width: 24.w,
               height: 24.w,
             ),
@@ -69,7 +83,7 @@ class Page175 extends StatelessWidget {
                 padding: EdgeInsets.only(right: 8.w),
                 decoration: BoxDecoration(
                   image: DecorationImage(
-                    image: AssetImage("assets/png/175/001.png"),
+                    image: Assets.png.m175.img1.image().image,
                     fit: BoxFit.cover,
                   ),
                 ),

diff --git a/lib/src/mobile_ui/51/page_51.dart b/lib/src/mobile_ui/51/page_51.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
-import 'package:flutter_svg/svg.dart';
+import 'package:flutter_ui_kit_obkm/gen/assets.gen.dart';
 import 'package:flutter_ui_kit_obkm/gen/colors.gen.dart';
 import 'package:get_it/get_it.dart';
 import 'package:google_fonts/google_fonts.dart';
@@ -38,8 +38,7 @@ class _Page51State extends State<Page51> {
                       onTap: () {
                         GetIt.I.get<NavigationService>().back();
                       },
-                      child: SvgPicture.asset(
-                        "assets/svg/51/menu_open.svg",
+                      child: Assets.svg.m51.menuOpen.svg(
                         height: 24.r,
                         width: 24.r,
                         fit: BoxFit.fill,
@@ -49,8 +48,7 @@ class _Page51State extends State<Page51> {
                       onTap: () {
                         GetIt.I.get<NavigationService>().back();
                       },
-                      child: SvgPicture.asset(
-                        "assets/svg/51/more_horiz.svg",
+                      child: Assets.svg.m51.moreHoriz.svg(
                         height: 24.r,
                         width: 24.r,
                         fit: BoxFit.fill,
@@ -67,7 +65,7 @@ class _Page51State extends State<Page51> {
                 style: GoogleFonts.workSans(
                   textStyle: TextStyle(
                     fontSize: 24.sp,
-                    color: ColorName.grayC4,
+                    color: ColorName.black,
                     fontWeight: FontWeight.w600,
                   ),
                 ),
@@ -80,7 +78,7 @@ class _Page51State extends State<Page51> {
                 style: GoogleFonts.workSans(
                   textStyle: TextStyle(
                     fontSize: 14.sp,
-                    color: ColorName.grayC4,
+                    color: ColorName.black,
                     fontWeight: FontWeight.w400,
                   ),
                 ),
@@ -93,7 +91,7 @@ class _Page51State extends State<Page51> {
                 style: GoogleFonts.workSans(
                   textStyle: TextStyle(
                     fontSize: 24.sp,
-                    color: ColorName.grayC4,
+                    color: ColorName.black,
                     fontWeight: FontWeight.w600,
                   ),
                 ),
@@ -113,7 +111,7 @@ class _Page51State extends State<Page51> {
                         style: GoogleFonts.workSans(
                           textStyle: TextStyle(
                             fontSize: 14.sp,
-                            color: ColorName.grayC4,
+                            color: ColorName.black,
                             fontWeight: FontWeight.w400,
                           ),
                         ),