Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

V-2: Section Redesign #7

Open
wants to merge 12 commits into
base: main
Choose a base branch
from
Open

V-2: Section Redesign #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
9743dbf
Changing the File Structure
rafay99-epic Sep 12, 2023
3d01669
Adding-Pages
rafay99-epic Sep 12, 2023
8919ab2
Redesign: Assignment Section
rafay99-epic Sep 13, 2023
45c39ea
Fixing Font: Assignment Page
rafay99-epic Sep 13, 2023
7c209a6
Code optimization: Assignment-Services
rafay99-epic Sep 14, 2023
538936c
Code optimization: Text Style in Assignment Service
rafay99-epic Sep 14, 2023
f428218
Redesign: Assignment Page: Adding more Cards
rafay99-epic Sep 14, 2023
ed3dadc
Terms & Conditions Page with Custom Widgets
rafay99-epic Sep 14, 2023
9ac2c9e
Orderlist Widget Fix
rafay99-epic Sep 14, 2023
a75af28
File Renaming & ML Redesign
rafay99-epic Sep 16, 2023
bbdd961
Android Service Redesign
rafay99-epic Sep 16, 2023
0b88f68
Android Service Redesign: Card Modification
rafay99-epic Sep 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/main.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import 'package:flutter/material.dart';
import '/pages/splash_screen.dart';
import 'src/pages/splash_screen.dart';

void main() {
runApp(const MyApp());
Expand Down
27 changes: 0 additions & 27 deletions lib/pages/services/Assignment.dart
View file
Open in desktop

This file was deleted.

24 changes: 0 additions & 24 deletions lib/pages/services/ML.dart
View file
Open in desktop

This file was deleted.

24 changes: 0 additions & 24 deletions lib/pages/services/Mobile.dart
View file
Open in desktop

This file was deleted.

10 changes: 5 additions & 5 deletions lib/pages/Bottom_Nav.dart → lib/src/pages/Bottom_Nav.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
// ignore: file_names
import 'package:flutter/material.dart';
import 'package:google_nav_bar/google_nav_bar.dart';
import 'package:future_insight/pages/author.dart';
import 'package:future_insight/pages/blog_post.dart';
import 'package:future_insight/pages/contact.dart';
import 'package:future_insight/pages/services.dart';
import 'package:future_insight/pages/home.dart';
import 'package:future_insight/src/pages/author.dart';
import 'package:future_insight/src/pages/blog_post.dart';
import 'package:future_insight/src/pages/contact.dart';
import 'package:future_insight/src/pages/services.dart';
import 'package:future_insight/src/pages/home.dart';

class Navbar extends StatefulWidget {
// const Navbar({super.key});
Expand Down
4 changes: 2 additions & 2 deletions lib/pages/author.dart → lib/src/pages/author.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import 'package:flutter/material.dart';
import 'package:future_insight/widgets/WebViewWidget.dart';
import 'package:future_insight/widgets/AppBar/appbar.dart';
import 'package:future_insight/src/widgets/WebViewWidget.dart';
import 'package:future_insight/src/widgets/AppBar/appbar.dart';

// ignore: camel_case_types
class author extends StatelessWidget {
Expand Down
4 changes: 2 additions & 2 deletions lib/pages/blog_post.dart → lib/src/pages/blog_post.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// ignore_for_file: camel_case_types
import 'package:flutter/material.dart';
import 'package:future_insight/widgets/WebViewWidget.dart';
import 'package:future_insight/widgets/AppBar/appbar.dart';
import 'package:future_insight/src/widgets/WebViewWidget.dart';
import 'package:future_insight/src/widgets/AppBar/appbar.dart';

class blog_post extends StatelessWidget {
const blog_post({super.key});
Expand Down
2 changes: 1 addition & 1 deletion lib/pages/contact.dart → lib/src/pages/contact.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import 'package:flutter/material.dart';
import 'package:contactus/contactus.dart';
import 'package:future_insight/widgets/AppBar/appbar.dart';
import 'package:future_insight/src/widgets/AppBar/appbar.dart';

class ContactUS extends StatefulWidget {
const ContactUS({Key? key}) : super(key: key);
Expand Down
0 lib/pages/hidden_drawer.dart → lib/src/pages/hidden_drawer.dart
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions lib/pages/home.dart → lib/src/pages/home.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import 'package:flutter/material.dart';
import 'package:future_insight/widgets/WebViewWidget.dart';
import 'package:future_insight/widgets/AppBar/appbar.dart';
import 'package:future_insight/src/widgets/WebViewWidget.dart';
import 'package:future_insight/src/widgets/AppBar/appbar.dart';

class HomeScreen extends StatefulWidget {
const HomeScreen({super.key});
Expand Down
49 changes: 25 additions & 24 deletions lib/pages/services.dart → lib/src/pages/services.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import 'package:flutter/material.dart';
import 'package:future_insight/widgets/service-boxes.dart';
import 'package:future_insight/pages/services/Assignment.dart';
import 'package:future_insight/pages/services/ML.dart';
import 'package:future_insight/pages/services/Web.dart';
import 'package:future_insight/pages/services/Mobile.dart';
import 'package:future_insight/widgets/AppBar/appbar.dart';
import 'package:future_insight/src/pages/services/android_app_dev.dart';
import 'package:future_insight/src/widgets/service-boxes.dart';
import 'package:future_insight/src/pages/services/assignemnt_service.dart';
import 'package:future_insight/src/pages/services/machine-learning_service.dart';
import 'package:future_insight/src/pages/services/web_dev.dart';
import 'package:future_insight/src/widgets/AppBar/appbar.dart';

class Services extends StatefulWidget {
const Services({Key? key}) : super(key: key);
Expand Down Expand Up @@ -50,19 +50,19 @@ class _ServicesState extends State<Services> {
gifAsset: 'assets/lottie/service/assignment.gif',
onTap: () {
Navigator.push(
context,
PageRouteBuilder(
pageBuilder: (_, __, ___) => const assignment_service(),
transitionDuration: const Duration(microseconds: 500),
transitionsBuilder: (_, a, __, c) => SlideTransition(
position: Tween<Offset>(
begin: const Offset(1.0, 0.0),
end: Offset.zero,
).animate(a),
child: c,
),
),
);
context,
PageRouteBuilder(
pageBuilder: (_, __, ___) =>
const assignemnt_service(),
transitionDuration: const Duration(milliseconds: 300),
transitionsBuilder: (_, a, __, c) => SlideTransition(
position: Tween<Offset>(
begin: const Offset(1.0, 0.0),
end: Offset.zero,
).animate(a),
child: c,
),
));
},
),
),
Expand All @@ -75,8 +75,9 @@ class _ServicesState extends State<Services> {
Navigator.push(
context,
PageRouteBuilder(
pageBuilder: (_, __, ___) => const ML_Service(),
transitionDuration: const Duration(microseconds: 500),
pageBuilder: (_, __, ___) =>
const machine_learning_service(),
transitionDuration: const Duration(milliseconds: 300),
transitionsBuilder: (_, a, __, c) => SlideTransition(
position: Tween<Offset>(
begin: const Offset(1.0, 0.0),
Expand All @@ -100,7 +101,7 @@ class _ServicesState extends State<Services> {
context,
PageRouteBuilder(
pageBuilder: (_, __, ___) => const Web_Devlopment(),
transitionDuration: const Duration(microseconds: 500),
transitionDuration: const Duration(milliseconds: 300),
transitionsBuilder: (_, a, __, c) => SlideTransition(
position: Tween<Offset>(
begin: const Offset(1.0, 0.0),
Expand All @@ -124,8 +125,8 @@ class _ServicesState extends State<Services> {
context,
PageRouteBuilder(
pageBuilder: (_, __, ___) =>
const application_development(),
transitionDuration: const Duration(microseconds: 500),
const android_app_service(),
transitionDuration: const Duration(milliseconds: 300),
transitionsBuilder: (_, a, __, c) => SlideTransition(
position: Tween<Offset>(
begin: const Offset(1.0, 0.0),
Expand Down
Loading