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

Added Bottomsheet with ChatList #5

Closed
wants to merge 2 commits into from
Closed

Added Bottomsheet with ChatList #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7728961
Added Bottomsheet with ChatList
Aug 19, 2019
014bbef
Added Bottomsheet with ChatList
Aug 19, 2019
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
Binary file added .gradle/5.1.1/fileChanges/last-build.bin
View file
Open in desktop
Binary file not shown.
Binary file added .gradle/5.1.1/fileHashes/fileHashes.lock
View file
Open in desktop
Binary file not shown.
Empty file added .gradle/5.1.1/gc.properties
View file
Open in desktop
Empty file.
Binary file added .gradle/buildOutputCleanup/buildOutputCleanup.lock
View file
Open in desktop
Binary file not shown.
2 changes: 2 additions & 0 deletions .gradle/buildOutputCleanup/cache.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
#Mon Aug 19 00:34:07 IST 2019
gradle.version=5.1.1
Empty file added .gradle/vcs-1/gc.properties
View file
Open in desktop
Empty file.
8 changes: 5 additions & 3 deletions lib/config/Palette.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,16 @@ import 'package:flutter/material.dart';

// Color palette for the app
class Palette{
static Color primaryColor = Colors.blue;
static Color primaryColor = Colors.white;
static Color accentColor = Color(0xff4fc3f7);
static Color secondaryColor = Colors.black;
static Color primaryTextColor = Colors.black;
static Color secondaryTextColor = Colors.black87;
static Color primaryBackgroundColor = Colors.white;
static Color selfMessageBackgroundColor = Colors.blueGrey;
static Color otherMessageBackgroundColor = Colors.tealAccent;
static Color selfMessageBackgroundColor = Color(0xff4fc3f7);
static Color otherMessageBackgroundColor = Colors.white;
static Color selfMessageColor = Colors.white;
static Color otherMessageColor = Color(0xff3f3f3f);
static Color greyColor = Colors.grey;
static Color chatBackgroundColor = Color(0xfffafafa) ;
}
20 changes: 20 additions & 0 deletions lib/config/Styles.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
import 'package:flutter/material.dart';

import 'Palette.dart';

class Styles{
static TextStyle textHeading = TextStyle(
color: Palette.primaryTextColor,
fontSize: 20); // Text style for the name
static TextStyle subHeading = TextStyle(
color: Palette.primaryTextColor,
fontSize: 14);
static TextStyle text = TextStyle(
color: Palette.secondaryTextColor);
static TextStyle subText = TextStyle(
color: Palette.greyColor);
static TextStyle date = TextStyle(
color: Palette.greyColor,
fontSize: 12.0,
fontStyle: FontStyle.normal);
}
7 changes: 4 additions & 3 deletions lib/main.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import 'package:flutter/material.dart';
import 'pages/ConversationPageList.dart';
import 'config/Palette.dart';
import 'pages/ConversationPageSlide.dart';

void main() => runApp(Messio());

Expand All @@ -10,9 +11,9 @@ class Messio extends StatelessWidget {
return MaterialApp(
title: 'Messio',
theme: ThemeData(
primarySwatch: Colors.blue,
primaryColor: Palette.primaryColor,
),
home: ConversationPageList(),
home: ConversationPageSlide(),
);
}
}
43 changes: 43 additions & 0 deletions lib/pages/ConversationBottomSheet.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
import 'package:flutter/material.dart';
import 'package:messio/config/Palette.dart';
import 'package:messio/config/Styles.dart';
import 'package:messio/widgets/ChatRowWidget.dart';

import 'package:messio/widgets/NavigationPillWidget.dart';

class ConversationBottomSheet extends StatefulWidget {
@override
_ConversationBottomSheetState createState() =>
_ConversationBottomSheetState();

const ConversationBottomSheet();
}

class _ConversationBottomSheetState extends State<ConversationBottomSheet> {
@override
Widget build(BuildContext context) {
return Material(
child: Scaffold(
backgroundColor: Colors.white,
body: ListView(children: <Widget>[
NavigationPillWidget(),
Center(child: Text('Messages', style: Styles.textHeading)),
SizedBox(
height: 20,
),
ListView.separated(
shrinkWrap: true,
physics: ClampingScrollPhysics(),
itemCount: 5,
separatorBuilder: (context, index) => Padding(
padding: EdgeInsets.only(left: 75,right: 20),
child: Divider(
color: Palette.accentColor,
)),
itemBuilder: (context, index) {
return ChatRowWidget();
},
)
])));
}
}
42 changes: 26 additions & 16 deletions lib/pages/ConversationPage.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,34 +1,44 @@
import 'package:flutter/material.dart';
import 'package:messio/config/Palette.dart';
import 'package:messio/pages/ConversationBottomSheet.dart';
import 'package:messio/widgets/ChatAppBar.dart';
import 'package:messio/widgets/ChatListWidget.dart';
import 'package:messio/widgets/InputWidget.dart';

class ConversationPage extends StatefulWidget {

@override
_ConversationPageState createState() => _ConversationPageState();

const ConversationPage();
}

class _ConversationPageState extends State<ConversationPage> {
final GlobalKey<ScaffoldState> _scaffoldKey = new GlobalKey<ScaffoldState>();

@override
Widget build(BuildContext context) {
return SafeArea(
child: Scaffold(
appBar: ChatAppBar(), // Custom app bar for chat screen
body: Stack(children: <Widget>[
Column(
children: <Widget>[
ChatListWidget(),
InputWidget()
],
),
]
)
)
);
child: Scaffold(
key: _scaffoldKey,
appBar: ChatAppBar(), // Custom app bar for chat screen
body: Container(
color: Palette.chatBackgroundColor,
child:Stack(children: <Widget>[
Column(
children: <Widget>[
ChatListWidget(),
GestureDetector(
child: InputWidget(),
onPanUpdate: (details) {
if (details.delta.dy <0) {
_scaffoldKey.currentState
.showBottomSheet<Null>((BuildContext context) {
return ConversationBottomSheet();
});
}
})
],
),
]))));
}


}
26 changes: 0 additions & 26 deletions lib/pages/ConversationPageList.dart
View file
Open in desktop

This file was deleted.

37 changes: 37 additions & 0 deletions lib/pages/ConversationPageSlide.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@

import 'package:flutter/material.dart';
import 'package:rubber/rubber.dart';
import 'ConversationPage.dart';

class ConversationPageSlide extends StatefulWidget {

@override
_ConversationPageSlideState createState() => _ConversationPageSlideState();

const ConversationPageSlide();
}

class _ConversationPageSlideState extends State<ConversationPageSlide> with SingleTickerProviderStateMixin {
var controller;

@override
void initState() {
controller = RubberAnimationController(
vsync: this,
);
super.initState();
}

@override
Widget build(BuildContext context) {

return PageView(
children: <Widget>[
ConversationPage(),
ConversationPage(),
ConversationPage()
],
);

}
}
22 changes: 10 additions & 12 deletions lib/widgets/ChatAppBar.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import 'package:flutter/material.dart';
import 'package:messio/config/Assets.dart';
import 'package:messio/config/Palette.dart';
import 'package:messio/config/Styles.dart';

class ChatAppBar extends StatelessWidget implements PreferredSizeWidget {
final double height = 100;
Expand All @@ -9,19 +10,16 @@ class ChatAppBar extends StatelessWidget implements PreferredSizeWidget {

@override
Widget build(BuildContext context) {
var textHeading = TextStyle(
color: Palette.primaryTextColor,
fontSize: 20); // Text style for the name
var textStyle = TextStyle(
color: Palette.secondaryTextColor); // Text style for everything else
// Text style for everything else

return Material(
child: Container(
decoration: new BoxDecoration(boxShadow: [
//adds a shadow to the appbar
new BoxShadow(
color: Colors.black,
blurRadius: 5.0,
color: Colors.grey,
blurRadius: 2.0,
spreadRadius: 0.1
)
]),
child: Container(
Expand Down Expand Up @@ -61,9 +59,9 @@ class ChatAppBar extends StatelessWidget implements PreferredSizeWidget {
mainAxisSize: MainAxisSize.min,
children: <Widget>[
Text('Aditya Gurjar',
style: textHeading),
style: Styles.textHeading),
Text('@adityagurjar',
style: textStyle)
style: Styles.text)
],
))),
],
Expand All @@ -80,21 +78,21 @@ class ChatAppBar extends StatelessWidget implements PreferredSizeWidget {
children: <Widget>[
Text(
'Photos',
style: textStyle,
style: Styles.text,
),
VerticalDivider(
width: 30,
color: Palette.primaryTextColor,
),
Text(
'Videos',
style: textStyle,
style: Styles.text,
),
VerticalDivider(
width: 30,
color: Palette.primaryTextColor,
),
Text('Files', style: textStyle)
Text('Files', style: Styles.text)
],
))),
],
Expand Down
11 changes: 3 additions & 8 deletions lib/widgets/ChatItemWidget.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import 'package:flutter/material.dart';
import 'package:messio/config/Palette.dart';
import 'package:intl/intl.dart';
import 'package:messio/config/Styles.dart';

class ChatItemWidget extends StatelessWidget{
final int index;
Expand Down Expand Up @@ -39,10 +40,7 @@ class ChatItemWidget extends StatelessWidget{
child: Text(
DateFormat('dd MMM kk:mm')
.format(DateTime.fromMillisecondsSinceEpoch(1565888474278)),
style: TextStyle(
color: Palette.greyColor,
fontSize: 12.0,
fontStyle: FontStyle.normal),
style: Styles.date,
),
margin: EdgeInsets.only(left: 5.0, top: 5.0, bottom: 5.0),
)])
Expand Down Expand Up @@ -72,10 +70,7 @@ class ChatItemWidget extends StatelessWidget{
child: Text(
DateFormat('dd MMM kk:mm')
.format(DateTime.fromMillisecondsSinceEpoch(1565888474278)),
style: TextStyle(
color: Palette.greyColor,
fontSize: 12.0,
fontStyle: FontStyle.normal),
style: Styles.date,
),
margin: EdgeInsets.only(left: 5.0, top: 5.0, bottom: 5.0),
)
Expand Down
57 changes: 57 additions & 0 deletions lib/widgets/ChatRowWidget.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
import 'package:flutter/material.dart';
import 'package:intl/intl.dart';
import 'package:messio/config/Assets.dart';
import 'package:messio/config/Styles.dart';

class ChatRowWidget extends StatelessWidget {
@override
Widget build(BuildContext context) {
return Container(
padding: EdgeInsets.fromLTRB(15, 5, 0, 5),
child: Row(
children: <Widget>[
Expanded(
flex: 8,
child: Row(
mainAxisSize: MainAxisSize.max,
children: <Widget>[
CircleAvatar(
radius: 30,
backgroundImage: Image.asset(
Assets.user,
).image,
),
SizedBox(
width: 15,
),
Container(
child: Column(
children: <Widget>[
Text('John Doe', style: Styles.subHeading),
Text(
'What\'s up?',
style: Styles.subText,
)
],
))
],
),
),
Expanded(
flex: 2,
child: Column(
mainAxisSize: MainAxisSize.max,
mainAxisAlignment: MainAxisAlignment.start,
children: <Widget>[
Text(
DateFormat('kk:mm').format(
DateTime.fromMillisecondsSinceEpoch(1565888474278)),
style: Styles.date,
)
],
),
)
],
));
}
}
Loading