diff --git a/aait/mobile/group-1/blog_app/assets/fonts/Urbanist/Urbanist-Black.ttf b/aait/mobile/group-1/blog_app/assets/fonts/Urbanist/Urbanist-Black.ttf new file mode 100644 index 000000000..3e9ea277d Binary files /dev/null and b/aait/mobile/group-1/blog_app/assets/fonts/Urbanist/Urbanist-Black.ttf differ diff --git a/aait/mobile/group-1/blog_app/assets/fonts/Urbanist/Urbanist-BlackItalic.ttf b/aait/mobile/group-1/blog_app/assets/fonts/Urbanist/Urbanist-BlackItalic.ttf new file mode 100644 index 000000000..a728584d6 Binary files /dev/null and b/aait/mobile/group-1/blog_app/assets/fonts/Urbanist/Urbanist-BlackItalic.ttf differ diff --git a/aait/mobile/group-1/blog_app/assets/fonts/Urbanist/Urbanist-Bold.ttf b/aait/mobile/group-1/blog_app/assets/fonts/Urbanist/Urbanist-Bold.ttf new file mode 100644 index 000000000..65287723a Binary files /dev/null and b/aait/mobile/group-1/blog_app/assets/fonts/Urbanist/Urbanist-Bold.ttf differ diff --git a/aait/mobile/group-1/blog_app/assets/fonts/Urbanist/Urbanist-BoldItalic.ttf b/aait/mobile/group-1/blog_app/assets/fonts/Urbanist/Urbanist-BoldItalic.ttf new file mode 100644 index 000000000..5af41d466 Binary files /dev/null and b/aait/mobile/group-1/blog_app/assets/fonts/Urbanist/Urbanist-BoldItalic.ttf differ diff --git a/aait/mobile/group-1/blog_app/assets/fonts/Urbanist/Urbanist-ExtraBold.ttf b/aait/mobile/group-1/blog_app/assets/fonts/Urbanist/Urbanist-ExtraBold.ttf new file mode 100644 index 000000000..3df7969be Binary files /dev/null and b/aait/mobile/group-1/blog_app/assets/fonts/Urbanist/Urbanist-ExtraBold.ttf differ diff --git a/aait/mobile/group-1/blog_app/assets/fonts/Urbanist/Urbanist-ExtraBoldItalic.ttf b/aait/mobile/group-1/blog_app/assets/fonts/Urbanist/Urbanist-ExtraBoldItalic.ttf new file mode 100644 index 000000000..cdb5a7984 Binary files /dev/null and b/aait/mobile/group-1/blog_app/assets/fonts/Urbanist/Urbanist-ExtraBoldItalic.ttf differ diff --git a/aait/mobile/group-1/blog_app/assets/fonts/Urbanist/Urbanist-ExtraLight.ttf b/aait/mobile/group-1/blog_app/assets/fonts/Urbanist/Urbanist-ExtraLight.ttf new file mode 100644 index 000000000..e0d09213d Binary files /dev/null and b/aait/mobile/group-1/blog_app/assets/fonts/Urbanist/Urbanist-ExtraLight.ttf differ diff --git a/aait/mobile/group-1/blog_app/assets/fonts/Urbanist/Urbanist-ExtraLightItalic.ttf b/aait/mobile/group-1/blog_app/assets/fonts/Urbanist/Urbanist-ExtraLightItalic.ttf new file mode 100644 index 000000000..a348f3ae6 Binary files /dev/null and b/aait/mobile/group-1/blog_app/assets/fonts/Urbanist/Urbanist-ExtraLightItalic.ttf differ diff --git a/aait/mobile/group-1/blog_app/assets/fonts/Urbanist/Urbanist-Italic.ttf b/aait/mobile/group-1/blog_app/assets/fonts/Urbanist/Urbanist-Italic.ttf new file mode 100644 index 000000000..e7082f63a Binary files /dev/null and b/aait/mobile/group-1/blog_app/assets/fonts/Urbanist/Urbanist-Italic.ttf differ diff --git a/aait/mobile/group-1/blog_app/assets/fonts/Urbanist/Urbanist-Light.ttf b/aait/mobile/group-1/blog_app/assets/fonts/Urbanist/Urbanist-Light.ttf new file mode 100644 index 000000000..23fa97b21 Binary files /dev/null and b/aait/mobile/group-1/blog_app/assets/fonts/Urbanist/Urbanist-Light.ttf differ diff --git a/aait/mobile/group-1/blog_app/assets/fonts/Urbanist/Urbanist-LightItalic.ttf b/aait/mobile/group-1/blog_app/assets/fonts/Urbanist/Urbanist-LightItalic.ttf new file mode 100644 index 000000000..6e82a2d3c Binary files /dev/null and b/aait/mobile/group-1/blog_app/assets/fonts/Urbanist/Urbanist-LightItalic.ttf differ diff --git a/aait/mobile/group-1/blog_app/assets/fonts/Urbanist/Urbanist-Medium.ttf b/aait/mobile/group-1/blog_app/assets/fonts/Urbanist/Urbanist-Medium.ttf new file mode 100644 index 000000000..30ba2f782 Binary files /dev/null and b/aait/mobile/group-1/blog_app/assets/fonts/Urbanist/Urbanist-Medium.ttf differ diff --git a/aait/mobile/group-1/blog_app/assets/fonts/Urbanist/Urbanist-MediumItalic.ttf b/aait/mobile/group-1/blog_app/assets/fonts/Urbanist/Urbanist-MediumItalic.ttf new file mode 100644 index 000000000..6d677517c Binary files /dev/null and b/aait/mobile/group-1/blog_app/assets/fonts/Urbanist/Urbanist-MediumItalic.ttf differ diff --git a/aait/mobile/group-1/blog_app/assets/fonts/Urbanist/Urbanist-Regular.ttf b/aait/mobile/group-1/blog_app/assets/fonts/Urbanist/Urbanist-Regular.ttf new file mode 100644 index 000000000..c4176d6c8 Binary files /dev/null and b/aait/mobile/group-1/blog_app/assets/fonts/Urbanist/Urbanist-Regular.ttf differ diff --git a/aait/mobile/group-1/blog_app/assets/fonts/Urbanist/Urbanist-SemiBold.ttf b/aait/mobile/group-1/blog_app/assets/fonts/Urbanist/Urbanist-SemiBold.ttf new file mode 100644 index 000000000..6f5e0b908 Binary files /dev/null and b/aait/mobile/group-1/blog_app/assets/fonts/Urbanist/Urbanist-SemiBold.ttf differ diff --git a/aait/mobile/group-1/blog_app/assets/fonts/Urbanist/Urbanist-SemiBoldItalic.ttf b/aait/mobile/group-1/blog_app/assets/fonts/Urbanist/Urbanist-SemiBoldItalic.ttf new file mode 100644 index 000000000..b63ad9535 Binary files /dev/null and b/aait/mobile/group-1/blog_app/assets/fonts/Urbanist/Urbanist-SemiBoldItalic.ttf differ diff --git a/aait/mobile/group-1/blog_app/assets/fonts/Urbanist/Urbanist-Thin.ttf b/aait/mobile/group-1/blog_app/assets/fonts/Urbanist/Urbanist-Thin.ttf new file mode 100644 index 000000000..6edeb96d9 Binary files /dev/null and b/aait/mobile/group-1/blog_app/assets/fonts/Urbanist/Urbanist-Thin.ttf differ diff --git a/aait/mobile/group-1/blog_app/assets/fonts/Urbanist/Urbanist-ThinItalic.ttf b/aait/mobile/group-1/blog_app/assets/fonts/Urbanist/Urbanist-ThinItalic.ttf new file mode 100644 index 000000000..940ff7924 Binary files /dev/null and b/aait/mobile/group-1/blog_app/assets/fonts/Urbanist/Urbanist-ThinItalic.ttf differ diff --git a/aait/mobile/group-1/blog_app/assets/fonts/poppins/Poppins-Bold.ttf b/aait/mobile/group-1/blog_app/assets/fonts/poppins/Poppins-Bold.ttf new file mode 100644 index 000000000..ff8a3b28c Binary files /dev/null and b/aait/mobile/group-1/blog_app/assets/fonts/poppins/Poppins-Bold.ttf differ diff --git a/aait/mobile/group-1/blog_app/assets/fonts/poppins/Poppins-Light.ttf b/aait/mobile/group-1/blog_app/assets/fonts/poppins/Poppins-Light.ttf new file mode 100644 index 000000000..e457aee17 Binary files /dev/null and b/aait/mobile/group-1/blog_app/assets/fonts/poppins/Poppins-Light.ttf differ diff --git a/aait/mobile/group-1/blog_app/assets/fonts/poppins/Poppins-Medium.ttf b/aait/mobile/group-1/blog_app/assets/fonts/poppins/Poppins-Medium.ttf new file mode 100644 index 000000000..07e5c5d51 Binary files /dev/null and b/aait/mobile/group-1/blog_app/assets/fonts/poppins/Poppins-Medium.ttf differ diff --git a/aait/mobile/group-1/blog_app/assets/fonts/poppins/Poppins-Regular.ttf b/aait/mobile/group-1/blog_app/assets/fonts/poppins/Poppins-Regular.ttf new file mode 100644 index 000000000..868384ce5 Binary files /dev/null and b/aait/mobile/group-1/blog_app/assets/fonts/poppins/Poppins-Regular.ttf differ diff --git a/aait/mobile/group-1/blog_app/assets/fonts/poppins/Poppins-SemiBold.ttf b/aait/mobile/group-1/blog_app/assets/fonts/poppins/Poppins-SemiBold.ttf new file mode 100644 index 000000000..8987d8006 Binary files /dev/null and b/aait/mobile/group-1/blog_app/assets/fonts/poppins/Poppins-SemiBold.ttf differ diff --git a/aait/mobile/group-1/blog_app/assets/fonts/poppins/SIL Open Font License.txt b/aait/mobile/group-1/blog_app/assets/fonts/poppins/SIL Open Font License.txt new file mode 100644 index 000000000..7417bb591 --- /dev/null +++ b/aait/mobile/group-1/blog_app/assets/fonts/poppins/SIL Open Font License.txt @@ -0,0 +1,43 @@ +Copyright (c) 2014, Indian Type Foundry (info@indiantypefoundry.com). + +This Font Software is licensed under the SIL Open Font License, Version 1.1. +This license is copied below, and is also available with a FAQ at: http://scripts.sil.org/OFL + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide development of collaborative font projects, to support the font creation efforts of academic and linguistic communities, and to provide a free and open framework in which fonts may be shared and improved in partnership with others. + +The OFL allows the licensed fonts to be used, studied, modified and redistributed freely as long as they are not sold by themselves. The fonts, including any derivative works, can be bundled, embedded, redistributed and/or sold with any software provided that any reserved names are not used by derivative works. The fonts and derivatives, however, cannot be released under any other type of license. The requirement for fonts to remain under this license does not apply to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright Holder(s) under this license and clearly marked as such. This may include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the copyright statement(s). + +"Original Version" refers to the collection of Font Software components as distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, or substituting -- in part or in whole -- any of the components of the Original Version, by changing formats or by porting the Font Software to a new environment. + +"Author" refers to any designer, engineer, programmer, technical writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining a copy of the Font Software, to use, study, copy, merge, embed, modify, redistribute, and sell modified and unmodified copies of the Font Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, redistributed and/or sold with any software, provided that each copy contains the above copyright notice and this license. These can be included either as stand-alone text files, human-readable headers or in the appropriate machine-readable metadata fields within text or binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font Name(s) unless explicit written permission is granted by the corresponding Copyright Holder. This restriction only applies to the primary font name as presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font Software shall not be used to promote, endorse or advertise any Modified Version, except to acknowledge the contribution(s) of the Copyright Holder(s) and the Author(s) or with their explicit written permission. + +5) The Font Software, modified or unmodified, in part or in whole, must be distributed entirely under this license, and must not be distributed under any other license. The requirement for fonts to remain under this license does not apply to any document created using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE. \ No newline at end of file diff --git a/aait/mobile/group-1/blog_app/assets/images/a2svImage.png b/aait/mobile/group-1/blog_app/assets/images/a2svImage.png new file mode 100644 index 000000000..eacdb8770 Binary files /dev/null and b/aait/mobile/group-1/blog_app/assets/images/a2svImage.png differ diff --git a/aait/mobile/group-1/blog_app/lib/assets/images/bg1.png b/aait/mobile/group-1/blog_app/assets/images/bg1.png similarity index 100% rename from aait/mobile/group-1/blog_app/lib/assets/images/bg1.png rename to aait/mobile/group-1/blog_app/assets/images/bg1.png diff --git a/aait/mobile/group-1/blog_app/assets/images/img1.png b/aait/mobile/group-1/blog_app/assets/images/img1.png new file mode 100644 index 000000000..bed8fdf33 Binary files /dev/null and b/aait/mobile/group-1/blog_app/assets/images/img1.png differ diff --git a/aait/mobile/group-1/blog_app/assets/images/img4.png b/aait/mobile/group-1/blog_app/assets/images/img4.png new file mode 100644 index 000000000..6ed4ee588 Binary files /dev/null and b/aait/mobile/group-1/blog_app/assets/images/img4.png differ diff --git a/aait/mobile/group-1/blog_app/lib/assets/images/img_saly10.png b/aait/mobile/group-1/blog_app/assets/images/img_saly10.png similarity index 100% rename from aait/mobile/group-1/blog_app/lib/assets/images/img_saly10.png rename to aait/mobile/group-1/blog_app/assets/images/img_saly10.png diff --git a/aait/mobile/group-1/blog_app/lib/assets/images/post_1.png b/aait/mobile/group-1/blog_app/lib/assets/images/post_1.png deleted file mode 100644 index e4ac793a8..000000000 Binary files a/aait/mobile/group-1/blog_app/lib/assets/images/post_1.png and /dev/null differ diff --git a/aait/mobile/group-1/blog_app/lib/assets/images/profile.png b/aait/mobile/group-1/blog_app/lib/assets/images/profile.png deleted file mode 100644 index 4a9355517..000000000 Binary files a/aait/mobile/group-1/blog_app/lib/assets/images/profile.png and /dev/null differ diff --git a/aait/mobile/group-1/blog_app/lib/features/intro_screens/onboarding_screens/onboarding_screen1.dart b/aait/mobile/group-1/blog_app/lib/features/intro_screens/onboarding_screens/onboarding_screen1.dart new file mode 100644 index 000000000..e69de29bb diff --git a/aait/mobile/group-1/blog_app/lib/features/intro_screens/splash_screen/splashScreenpage.dart b/aait/mobile/group-1/blog_app/lib/features/intro_screens/splash_screen/splashScreenpage.dart new file mode 100644 index 000000000..9886a570f --- /dev/null +++ b/aait/mobile/group-1/blog_app/lib/features/intro_screens/splash_screen/splashScreenpage.dart @@ -0,0 +1,47 @@ +import 'dart:async'; +import 'package:blog_app/features/intro_screens/onboarding_screens/onboarding_screen1.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter/services.dart'; + + +class SplashScreen extends StatefulWidget{ + + @override + _SplashScreenState createState() => _SplashScreenState(); +} + +class _SplashScreenState extends State { + @override + void initState() { + + super.initState(); + Timer(const Duration(seconds: 3), + ()=>Navigator.pushReplacement(context, + MaterialPageRoute(builder: + (context) => + OnboardingPage() + ) + ) + ); + } + @override + Widget build(BuildContext context) { + return SafeArea( + child: Scaffold( + body: Stack( + children: [ + Image.asset( + "assets/images/a2svImage.png", + height: double.infinity, + width: double.infinity, + fit: BoxFit.cover, + ), + ], + ), + ), + ); + } +} + + + diff --git a/aait/mobile/group-1/blog_app/lib/features/user_profile/data/repository/user_repository_implementaion.dart b/aait/mobile/group-1/blog_app/lib/features/user_profile/data/repository/user_repository_implementaion.dart index e7147957c..83cfdb99e 100644 --- a/aait/mobile/group-1/blog_app/lib/features/user_profile/data/repository/user_repository_implementaion.dart +++ b/aait/mobile/group-1/blog_app/lib/features/user_profile/data/repository/user_repository_implementaion.dart @@ -1,5 +1,5 @@ import 'package:blog_app/core/errors/failures/failure.dart'; -import 'package:blog_app/core/errors/failures/server_failure.dart'; +// import 'package:blog_app/core/errors/failures/server_failure.dart'; import 'package:blog_app/features/user_profile/data/datasources/profile_local_data_source.dart'; import 'package:blog_app/features/user_profile/data/datasources/proile_remote_data_source.dart'; import 'package:blog_app/features/user_profile/domain/entities/user_entity.dart'; @@ -27,7 +27,7 @@ class UserRepositoryImpl extends UserRepository { return Right(user); } catch (e) { print("error occured $e"); - return Left(ServerFailure(e.toString())); + return Left(ServerFailure(message:toString())); } } else { try { @@ -35,7 +35,7 @@ class UserRepositoryImpl extends UserRepository { return Right(user); } catch (e) { print("error occured $e"); - return Left(ServerFailure(e.toString())); + return Left(ServerFailure(message:e.toString())); } } } @@ -47,7 +47,7 @@ class UserRepositoryImpl extends UserRepository { return Right(user); } catch (e) { print("error occured $e"); - return Left(ServerFailure(e.toString())); + return Left(ServerFailure(message:e.toString())); } } } diff --git a/aait/mobile/group-1/blog_app/lib/main.dart b/aait/mobile/group-1/blog_app/lib/main.dart index a08d1e7a6..861a0c56b 100644 --- a/aait/mobile/group-1/blog_app/lib/main.dart +++ b/aait/mobile/group-1/blog_app/lib/main.dart @@ -5,6 +5,8 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import './features/user_profile/presentation/pages/profile.dart'; +import 'features/intro_screens/onboarding_screens/onboarding_screen1.dart'; +import 'features/intro_screens/splash_screen/splashScreenpage.dart'; import 'injection_container.dart' as di; void main() async { @@ -35,7 +37,7 @@ class MyApp extends StatelessWidget { //DevicePreview darkTheme: ThemeData.dark(), - home: const ProfilePage(), + home: SplashScreen(), ); } } diff --git a/aait/mobile/group-1/blog_app/pubspec.yaml b/aait/mobile/group-1/blog_app/pubspec.yaml index 08a3c1b0b..232e588bd 100644 --- a/aait/mobile/group-1/blog_app/pubspec.yaml +++ b/aait/mobile/group-1/blog_app/pubspec.yaml @@ -65,8 +65,6 @@ flutter: # To add assets to your application, add an assets section, like this: assets: - assets/images/ - - assets/images/profile.png - - assets/images/post_1.png # - images/a_dot_burr.jpeg # - images/a_dot_ham.jpeg # An image asset can refer to one or more resolution-specific "variants", see @@ -78,11 +76,10 @@ flutter: # "family" key with the font family name, and a "fonts" key with a # list giving the asset and other descriptors for the font. For # example: - # fonts: - # - family: Schyler - # fonts: - # - asset: fonts/Schyler-Regular.ttf - # - asset: fonts/Schyler-Italic.ttf + fonts: + - family: Urbanist + fonts: + - asset: assets/fonts/Urbanist/Urbanist-ExtraLightItalic.ttf # style: italic # - family: Trajan Pro # fonts: diff --git a/aastu/mobile/group-3/blog_application_aastu_grp3/pubspec.lock b/aastu/mobile/group-3/blog_application_aastu_grp3/pubspec.lock index 428158eb8..fe642d722 100644 --- a/aastu/mobile/group-3/blog_application_aastu_grp3/pubspec.lock +++ b/aastu/mobile/group-3/blog_application_aastu_grp3/pubspec.lock @@ -45,10 +45,10 @@ packages: dependency: transitive description: name: collection - sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687 + sha256: "4a07be6cb69c84d677a6c3096fcf960cc3285a8330b4603e0d463d15d9bd934c" url: "https://pub.dev" source: hosted - version: "1.17.2" + version: "1.17.1" cupertino_icons: dependency: "direct main" description: @@ -152,6 +152,14 @@ packages: url: "https://pub.dev" source: hosted version: "3.1.11" + js: + dependency: transitive + description: + name: js + sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3 + url: "https://pub.dev" + source: hosted + version: "0.6.7" lints: dependency: transitive description: @@ -164,18 +172,18 @@ packages: dependency: transitive description: name: matcher - sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e" + sha256: "6501fbd55da300384b768785b83e5ce66991266cec21af89ab9ae7f5ce1c4cbb" url: "https://pub.dev" source: hosted - version: "0.12.16" + version: "0.12.15" material_color_utilities: dependency: transitive description: name: material_color_utilities - sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41" + sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724 url: "https://pub.dev" source: hosted - version: "0.5.0" + version: "0.2.0" meta: dependency: transitive description: @@ -217,10 +225,10 @@ packages: dependency: transitive description: name: source_span - sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c" + sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250 url: "https://pub.dev" source: hosted - version: "1.10.0" + version: "1.9.1" stack_trace: dependency: transitive description: @@ -257,10 +265,10 @@ packages: dependency: transitive description: name: test_api - sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8" + sha256: eb6ac1540b26de412b3403a163d919ba86f6a973fe6cc50ae3541b80092fdcfb url: "https://pub.dev" source: hosted - version: "0.6.0" + version: "0.5.1" vector_math: dependency: transitive description: @@ -269,14 +277,6 @@ packages: url: "https://pub.dev" source: hosted version: "2.1.4" - web: - dependency: transitive - description: - name: web - sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10 - url: "https://pub.dev" - source: hosted - version: "0.1.4-beta" sdks: - dart: ">=3.1.0-185.0.dev <4.0.0" + dart: ">=3.0.5 <4.0.0" flutter: ">=1.20.0"