Added back navigation to some screens

bukunmialuko · Apr 10, 2022 · abf9b55 · abf9b55
1 parent 98b6d74
commit abf9b55
Show file tree

Hide file tree

Showing 12 changed files with 289 additions and 362 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -26,7 +26,7 @@ apply plugin: 'kotlin-android'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion 31
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
@@ -45,7 +45,7 @@ android {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "com.example.flutter_ui_kit_obkm"
         minSdkVersion 16
-        targetSdkVersion 30
+        targetSdkVersion 31
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
     }

diff --git a/android/build.gradle b/android/build.gradle
@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = '1.3.50'
+    ext.kotlin_version = '1.6.20'
     repositories {
         google()
         mavenCentral()

diff --git a/art/screenshots/page_42.png b/art/screenshots/page_42.png
diff --git a/lib/src/mobile_ui/27/page_27.dart b/lib/src/mobile_ui/27/page_27.dart
@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:flutter_svg/svg.dart';
 import 'package:get_it/get_it.dart';
-import 'package:google_fonts/google_fonts.dart';
+
 import '../../../res/asset_images.dart';
 import '../../navigation/navigation_service.dart';
 
@@ -102,7 +102,12 @@ class _Page27State extends State<Page27> {
                           return SizedBox(width: 20.w);
                         },
                         itemBuilder: (context, index) {
-                          return WorkoutCard();
+                          return GestureDetector(
+                            onTap: () {
+                              GetIt.I.get<NavigationService>().back();
+                            },
+                            child: WorkoutCard(),
+                          );
                         },
                       ),
                       SizedBox(width: 20.w),

diff --git a/lib/src/mobile_ui/33/page_33.dart b/lib/src/mobile_ui/33/page_33.dart
@@ -1,7 +1,10 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
+import 'package:get_it/get_it.dart';
 import 'package:google_fonts/google_fonts.dart';
 
+import '../../navigation/navigation_service.dart';
+
 class Page33 extends StatefulWidget {
   const Page33({Key? key}) : super(key: key);
 
@@ -75,44 +78,54 @@ class _Page33State extends State<Page33> {
             Row(
               mainAxisAlignment: MainAxisAlignment.center,
               children: [
-                Container(
-                  width: 90.w,
-                  height: 30.h,
-                  decoration: BoxDecoration(
-                    borderRadius: BorderRadius.circular(30.h),
-                    border: Border.all(color: Colors.black, width: 1.w),
-                  ),
-                  child: Center(
-                    child: Text(
-                      "ADD FRIEND",
-                      style: GoogleFonts.workSans(
-                        textStyle: TextStyle(
-                          fontSize: 12.sp,
-                          color: Colors.black,
-                          fontStyle: FontStyle.normal,
-                          fontWeight: FontWeight.w600,
+                GestureDetector(
+                  onTap: () {
+                    GetIt.I.get<NavigationService>().back();
+                  },
+                  child: Container(
+                    width: 90.w,
+                    height: 30.h,
+                    decoration: BoxDecoration(
+                      borderRadius: BorderRadius.circular(30.h),
+                      border: Border.all(color: Colors.black, width: 1.w),
+                    ),
+                    child: Center(
+                      child: Text(
+                        "ADD FRIEND",
+                        style: GoogleFonts.workSans(
+                          textStyle: TextStyle(
+                            fontSize: 12.sp,
+                            color: Colors.black,
+                            fontStyle: FontStyle.normal,
+                            fontWeight: FontWeight.w600,
+                          ),
                         ),
                       ),
                     ),
                   ),
                 ),
                 SizedBox(width: 8.w),
-                Container(
-                  width: 90.w,
-                  height: 30.h,
-                  decoration: BoxDecoration(
-                    color: Color(0xff262626),
-                    borderRadius: BorderRadius.circular(30.h),
-                  ),
-                  child: Center(
-                    child: Text(
-                      "FOLLOW",
-                      style: GoogleFonts.workSans(
-                        textStyle: TextStyle(
-                          fontSize: 12.sp,
-                          color: Colors.white,
-                          fontStyle: FontStyle.normal,
-                          fontWeight: FontWeight.w600,
+                GestureDetector(
+                  onTap: () {
+                    GetIt.I.get<NavigationService>().back();
+                  },
+                  child: Container(
+                    width: 90.w,
+                    height: 30.h,
+                    decoration: BoxDecoration(
+                      color: Color(0xff262626),
+                      borderRadius: BorderRadius.circular(30.h),
+                    ),
+                    child: Center(
+                      child: Text(
+                        "FOLLOW",
+                        style: GoogleFonts.workSans(
+                          textStyle: TextStyle(
+                            fontSize: 12.sp,
+                            color: Colors.white,
+                            fontStyle: FontStyle.normal,
+                            fontWeight: FontWeight.w600,
+                          ),
                         ),
                       ),
                     ),

diff --git a/lib/src/mobile_ui/34/page_34.dart b/lib/src/mobile_ui/34/page_34.dart
@@ -2,8 +2,11 @@ import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:flutter_ui_kit_obkm/src/res/colors.dart';
+import 'package:get_it/get_it.dart';
 import 'package:google_fonts/google_fonts.dart';
 
+import '../../navigation/navigation_service.dart';
+
 class Page34 extends StatefulWidget {
   const Page34({Key? key}) : super(key: key);
 
@@ -168,23 +171,28 @@ class _Page34State extends State<Page34> {
                         ],
                       ),
                     ),
-                    Container(
-                      height: 30.h,
-                      width: 89.w,
-                      decoration: BoxDecoration(
-                        color: AppColors.black,
-                        borderRadius: BorderRadius.circular(15.r),
-                      ),
-                      child: Padding(
-                        padding: EdgeInsets.symmetric(horizontal: 0),
-                        child: Center(
-                          child: Text(
-                            "FOLLOW",
-                            style: GoogleFonts.workSans(
-                              textStyle: TextStyle(
-                                fontSize: 12.sp,
-                                color: AppColors.white,
-                                fontWeight: FontWeight.w600,
+                    GestureDetector(
+                      onTap: () {
+                        GetIt.I.get<NavigationService>().back();
+                      },
+                      child: Container(
+                        height: 30.h,
+                        width: 89.w,
+                        decoration: BoxDecoration(
+                          color: AppColors.black,
+                          borderRadius: BorderRadius.circular(15.r),
+                        ),
+                        child: Padding(
+                          padding: EdgeInsets.symmetric(horizontal: 0),
+                          child: Center(
+                            child: Text(
+                              "FOLLOW",
+                              style: GoogleFonts.workSans(
+                                textStyle: TextStyle(
+                                  fontSize: 12.sp,
+                                  color: AppColors.white,
+                                  fontWeight: FontWeight.w600,
+                                ),
                               ),
                             ),
                           ),