Skip to content

New Changes #45

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.

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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 .flutter-plugins-dependencies
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"path_provider_foundation","path":"/Users/jideguru/.pub-cache/hosted/pub.dev/path_provider_foundation-2.2.4/","shared_darwin_source":true,"native_build":true,"dependencies":[]}],"android":[{"name":"path_provider_android","path":"/Users/jideguru/.pub-cache/hosted/pub.dev/path_provider_android-2.0.27/","native_build":true,"dependencies":[]}],"macos":[{"name":"path_provider_foundation","path":"/Users/jideguru/.pub-cache/hosted/pub.dev/path_provider_foundation-2.2.4/","shared_darwin_source":true,"native_build":true,"dependencies":[]}],"linux":[{"name":"path_provider_linux","path":"/Users/jideguru/.pub-cache/hosted/pub.dev/path_provider_linux-2.1.11/","native_build":false,"dependencies":[]}],"windows":[{"name":"path_provider_windows","path":"/Users/jideguru/.pub-cache/hosted/pub.dev/path_provider_windows-2.1.7/","native_build":false,"dependencies":[]}],"web":[]},"dependencyGraph":[{"name":"path_provider","dependencies":["path_provider_android","path_provider_foundation","path_provider_linux","path_provider_windows"]},{"name":"path_provider_android","dependencies":[]},{"name":"path_provider_foundation","dependencies":[]},{"name":"path_provider_linux","dependencies":[]},{"name":"path_provider_windows","dependencies":[]}],"date_created":"2023-07-18 00:48:47.900504","version":"3.10.6"}
{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"path_provider_foundation","path":"C:\\\\Users\\\\Abdulrahman\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dev\\\\path_provider_foundation-2.2.4\\\\","shared_darwin_source":true,"native_build":true,"dependencies":[]}],"android":[{"name":"path_provider_android","path":"C:\\\\Users\\\\Abdulrahman\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dev\\\\path_provider_android-2.0.27\\\\","native_build":true,"dependencies":[]}],"macos":[{"name":"path_provider_foundation","path":"C:\\\\Users\\\\Abdulrahman\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dev\\\\path_provider_foundation-2.2.4\\\\","shared_darwin_source":true,"native_build":true,"dependencies":[]}],"linux":[{"name":"path_provider_linux","path":"C:\\\\Users\\\\Abdulrahman\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dev\\\\path_provider_linux-2.1.11\\\\","native_build":false,"dependencies":[]}],"windows":[{"name":"path_provider_windows","path":"C:\\\\Users\\\\Abdulrahman\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dev\\\\path_provider_windows-2.1.7\\\\","native_build":false,"dependencies":[]}],"web":[]},"dependencyGraph":[{"name":"path_provider","dependencies":["path_provider_android","path_provider_foundation","path_provider_linux","path_provider_windows"]},{"name":"path_provider_android","dependencies":[]},{"name":"path_provider_foundation","dependencies":[]},{"name":"path_provider_linux","dependencies":[]},{"name":"path_provider_windows","dependencies":[]}],"date_created":"2024-03-22 21:51:49.401972","version":"3.16.5"}
11 changes: 10 additions & 1 deletion lib/views/screens/home.dart
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
// This is the HomePage for the Application
import 'package:flutter/material.dart';
import 'package:social_app_ui/views/widgets/post_item.dart';
import 'package:social_app_ui/util/data.dart';
import 'package:google_fonts/google_fonts.dart';

class Home extends StatefulWidget {
@override
Expand All @@ -11,8 +13,13 @@ class _HomeState extends State<Home> {
@override
Widget build(BuildContext context) {
return Scaffold(
// AppBar
appBar: AppBar(
title: Text("Feeds"),
title: Text("Feeds",
style: GoogleFonts.montserrat(
fontSize: 14,
fontWeight: FontWeight.bold,
)),
centerTitle: true,
actions: <Widget>[
IconButton(
Expand All @@ -23,11 +30,13 @@ class _HomeState extends State<Home> {
),
],
),
// List: Used to display the Posts
body: ListView.builder(
padding: EdgeInsets.symmetric(horizontal: 20),
itemCount: posts.length,
itemBuilder: (BuildContext context, int index) {
Map post = posts[index];
// This is the Post item used to add the image,name,desctiption and time
return PostItem(
img: post['img'],
name: post['name'],
Expand Down
72 changes: 39 additions & 33 deletions lib/views/screens/main_screen.dart
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
// This is the Main Screen for the App
import 'package:flutter/material.dart';
import 'package:social_app_ui/views/widgets/icon_badge.dart';
import 'package:social_app_ui/views/screens/chat/chats.dart';
Expand Down Expand Up @@ -30,6 +31,7 @@ class _MainScreenState extends State<MainScreen> {
Profile(),
],
),
// Navigation Bar: used to navigate between the Screen
bottomNavigationBar: Theme(
data: Theme.of(context).copyWith(
// sets the background color of the `BottomNavigationBar`
Expand All @@ -40,43 +42,47 @@ class _MainScreenState extends State<MainScreen> {
bodySmall: TextStyle(color: Colors.grey[500]),
),
),
child: BottomNavigationBar(
type: BottomNavigationBarType.fixed,
items: <BottomNavigationBarItem>[
BottomNavigationBarItem(
icon: Icon(
Icons.message,
),
label: '',
),
BottomNavigationBarItem(
icon: Icon(
Icons.group,
),
label: '',
),
BottomNavigationBarItem(
icon: Icon(
Icons.home,
),
label: '',
),
BottomNavigationBarItem(
icon: IconBadge(icon: Icons.notifications),
label: '',
),
BottomNavigationBarItem(
icon: Icon(Icons.person),
label: '',
),
],
onTap: navigationTapped,
currentIndex: _page,
),
child: BottomNaviationBar(),
),
);
}

dynamic BottomNaviationBar() {
return BottomNavigationBar(
type: BottomNavigationBarType.fixed,
items: <BottomNavigationBarItem>[
BottomNavigationBarItem(
icon: Icon(
Icons.message,
),
label: '',
),
BottomNavigationBarItem(
icon: Icon(
Icons.group,
),
label: 'Friends',
),
BottomNavigationBarItem(
icon: Icon(
Icons.home,
),
label: 'HOme',
),
BottomNavigationBarItem(
icon: IconBadge(icon: Icons.notifications),
label: 'Notifications',
),
BottomNavigationBarItem(
icon: Icon(Icons.person),
label: 'Profile',
),
],
onTap: navigationTapped,
currentIndex: _page,
);
}

void navigationTapped(int page) {
_pageController.jumpToPage(page);
}
Expand Down
5 changes: 5 additions & 0 deletions lib/views/screens/notifications.dart
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import 'package:flutter/material.dart';
import 'package:google_fonts/google_fonts.dart';
import 'package:social_app_ui/util/data.dart';

class Notifications extends StatefulWidget {
Expand All @@ -13,6 +14,10 @@ class _NotificationsState extends State<Notifications> {
appBar: AppBar(
title: Text(
"Notifications",
style: GoogleFonts.montserrat(
fontSize: 14,
fontWeight: FontWeight.bold,
),
),
centerTitle: true,
actions: <Widget>[
Expand Down
1 change: 1 addition & 0 deletions lib/views/screens/profile.dart
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
// Profile Page
import 'dart:math';

import 'package:flutter/material.dart';
Expand Down
46 changes: 27 additions & 19 deletions pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,10 @@ packages:
dependency: transitive
description:
name: collection
sha256: "4a07be6cb69c84d677a6c3096fcf960cc3285a8330b4603e0d463d15d9bd934c"
sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
url: "https://pub.dev"
source: hosted
version: "1.17.1"
version: "1.18.0"
convert:
dependency: transitive
description:
Expand Down Expand Up @@ -111,10 +111,10 @@ packages:
dependency: "direct main"
description:
name: google_fonts
sha256: "2776c66b3e97c6cdd58d1bd3281548b074b64f1fd5c8f82391f7456e38849567"
sha256: "5b1726fee554d1cc9db1baef8061b126567ff0a1140a03ed7de936e62f2ab98b"
url: "https://pub.dev"
source: hosted
version: "4.0.5"
version: "6.2.0"
http:
dependency: transitive
description:
Expand Down Expand Up @@ -151,26 +151,26 @@ packages:
dependency: transitive
description:
name: matcher
sha256: "6501fbd55da300384b768785b83e5ce66991266cec21af89ab9ae7f5ce1c4cbb"
sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e"
url: "https://pub.dev"
source: hosted
version: "0.12.15"
version: "0.12.16"
material_color_utilities:
dependency: transitive
description:
name: material_color_utilities
sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724
sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41"
url: "https://pub.dev"
source: hosted
version: "0.2.0"
version: "0.5.0"
meta:
dependency: transitive
description:
name: meta
sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3"
sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e
url: "https://pub.dev"
source: hosted
version: "1.9.1"
version: "1.10.0"
path:
dependency: transitive
description:
Expand Down Expand Up @@ -260,26 +260,26 @@ packages:
dependency: transitive
description:
name: source_span
sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250
sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c"
url: "https://pub.dev"
source: hosted
version: "1.9.1"
version: "1.10.0"
stack_trace:
dependency: transitive
description:
name: stack_trace
sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5
sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b"
url: "https://pub.dev"
source: hosted
version: "1.11.0"
version: "1.11.1"
stream_channel:
dependency: transitive
description:
name: stream_channel
sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8"
sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7
url: "https://pub.dev"
source: hosted
version: "2.1.1"
version: "2.1.2"
string_scanner:
dependency: transitive
description:
Expand All @@ -300,10 +300,10 @@ packages:
dependency: transitive
description:
name: test_api
sha256: eb6ac1540b26de412b3403a163d919ba86f6a973fe6cc50ae3541b80092fdcfb
sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b"
url: "https://pub.dev"
source: hosted
version: "0.5.1"
version: "0.6.1"
typed_data:
dependency: transitive
description:
Expand All @@ -320,6 +320,14 @@ packages:
url: "https://pub.dev"
source: hosted
version: "2.1.4"
web:
dependency: transitive
description:
name: web
sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152
url: "https://pub.dev"
source: hosted
version: "0.3.0"
win32:
dependency: transitive
description:
Expand All @@ -337,5 +345,5 @@ packages:
source: hosted
version: "1.0.1"
sdks:
dart: ">=3.0.0 <4.0.0"
dart: ">=3.2.0-194.0.dev <4.0.0"
flutter: ">=3.10.0"
2 changes: 1 addition & 1 deletion pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ dependencies:
flutter:
sdk: flutter
cupertino_icons: ^1.0.5
google_fonts: ^4.0.4
google_fonts: ^6.2.0
flutter_staggered_animations: ^1.1.1
lottie: ^2.4.0

Expand Down