tovi
/
Envelope
1
0
Fork 0
Code Issues 0 Pull Requests 0 Projects 0 Releases 0 Wiki Activity
Browse Source

Add initial conversation list/friend list

pull/1/head
Tovi Jaeschke-Rogers 3 years ago
parent
00e3cc3620
commit
52576132cc
14 changed files with 397 additions and 204 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +1
    -0
      Backend/Database/Init.go
  2. +9
    -0
      Backend/Models/Friends.go
  3. +2
    -2
      Backend/Models/Messages.go
  4. +35
    -8
      mobile/lib/main.dart
  5. +9
    -0
      mobile/lib/models/friends.dart
  6. +19
    -37
      mobile/lib/views/authentication/login.dart
  7. +16
    -36
      mobile/lib/views/authentication/signup.dart
  8. +56
    -0
      mobile/lib/views/main/conversation_list.dart
  9. +0
    -112
      mobile/lib/views/main/conversations_list.dart
  10. +105
    -0
      mobile/lib/views/main/friend_list.dart
  11. +56
    -0
      mobile/lib/views/main/friend_list_item.dart
  12. +72
    -0
      mobile/lib/views/main/home.dart
  13. +9
    -9
      mobile/pubspec.lock
  14. +8
    -0
      mobile/windows/flutter/generated_plugins.cmake

+ 1
- 0
Backend/Database/Init.go View File

@ -19,6 +19,7 @@ var (
func GetModels() []interface{} { func GetModels() []interface{} {
return []interface{}{ return []interface{}{
&Models.User{}, &Models.User{},
&Models.Friend{},
&Models.MessageData{}, &Models.MessageData{},
&Models.MessageKey{}, &Models.MessageKey{},
} }


+ 9
- 0
Backend/Models/Friends.go View File

@ -0,0 +1,9 @@
package Models
import "github.com/gofrs/uuid"
type Friend struct {
Base
UserID uuid.UUID `gorm:"type:uuid;column:user_id;not null;" json:"user_id"`
FriendId string `gorm:"column:friend_id;not null" json:"friend_id"` // Stored encrypted
}

+ 2
- 2
Backend/Models/Messages.go View File

@ -4,12 +4,12 @@ import "github.com/gofrs/uuid"
type MessageData struct { type MessageData struct {
Base Base
Data []byte `gorm:"not null" json:"data"` // Stored encrypted
Data string `gorm:"not null" json:"data"` // Stored encrypted
} }
type MessageKey struct { type MessageKey struct {
Base Base
UserID uuid.UUID `gorm:"type:uuid;column:user_id;not null;" json:"user_id"` UserID uuid.UUID `gorm:"type:uuid;column:user_id;not null;" json:"user_id"`
MessageDataID uuid.UUID `gorm:"type:uuid;column:message_data_id;not null;" json:"message_data_id"` MessageDataID uuid.UUID `gorm:"type:uuid;column:message_data_id;not null;" json:"message_data_id"`
SymmetricKey []byte `gorm:"not null" json:"symmetric_key"` // Stored encrypted
SymmetricKey string `gorm:"not null" json:"symmetric_key"` // Stored encrypted
} }

+ 35
- 8
mobile/lib/main.dart View File

@ -1,25 +1,52 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import '/views/main/conversations_list.dart';
import '/views/main/home.dart';
import '/views/authentication/unauthenticated_landing.dart';
import '/views/authentication/login.dart';
import '/views/authentication/signup.dart';
void main() { void main() {
runApp(const Home());
runApp(const MyApp());
} }
class Home extends StatelessWidget {
const Home({Key? key}) : super(key: key);
class MyApp extends StatelessWidget {
const MyApp({Key? key}) : super(key: key);
static const String _title = 'Envelope'; static const String _title = 'Envelope';
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return const MaterialApp(
return MaterialApp(
title: _title, title: _title,
home: Scaffold(
routes: {
'/home': (context) => const Home(),
'/landing': (context) => const UnauthenticatedLandingWidget(),
'/login': (context) => const Login(),
'/signup': (context) => const Signup(),
},
home: const Scaffold(
backgroundColor: Colors.cyan, backgroundColor: Colors.cyan,
body: SafeArea( body: SafeArea(
child: ConversationsList(),
child: Home(),
) )
)
),
theme: ThemeData(
appBarTheme: const AppBarTheme(
backgroundColor: Colors.cyan,
elevation: 0,
),
inputDecorationTheme: const InputDecorationTheme(
border: OutlineInputBorder(),
focusedBorder: OutlineInputBorder(),
labelStyle: TextStyle(
color: Colors.white,
fontSize: 30,
),
filled: true,
fillColor: Colors.white,
),
),
); );
} }
} }

+ 9
- 0
mobile/lib/models/friends.dart View File

@ -0,0 +1,9 @@
class Friend{
String id;
String username;
Friend({
required this.id,
required this.username,
});
}

+ 19
- 37
mobile/lib/views/authentication/login.dart View File

@ -2,9 +2,7 @@ import 'dart:convert';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:http/http.dart' as http; import 'package:http/http.dart' as http;
import 'package:shared_preferences/shared_preferences.dart'; import 'package:shared_preferences/shared_preferences.dart';
import '/views/main/conversations_list.dart';
import '/views/main/conversation_list.dart';
import '/utils/encryption/rsa_key_helper.dart'; import '/utils/encryption/rsa_key_helper.dart';
import '/utils/encryption/aes_helper.dart'; import '/utils/encryption/aes_helper.dart';
import '/utils/storage/encryption_keys.dart'; import '/utils/storage/encryption_keys.dart';
@ -67,42 +65,22 @@ class Login extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return MaterialApp(
title: _title,
home: Scaffold(
backgroundColor: Colors.cyan,
appBar: AppBar(
title: null,
automaticallyImplyLeading: true,
//`true` if you want Flutter to automatically add Back Button when needed,
//or `false` if you want to force your own back button every where
leading: IconButton(icon: const Icon(Icons.arrow_back),
//onPressed:() => Navigator.pop(context, false),
onPressed:() => {
Navigator.pop(context)
}
)
),
body: const SafeArea(
child: LoginWidget(),
return Scaffold(
backgroundColor: Colors.cyan,
appBar: AppBar(
title: null,
automaticallyImplyLeading: true,
//`true` if you want Flutter to automatically add Back Button when needed,
//or `false` if you want to force your own back button every where
leading: IconButton(icon: const Icon(Icons.arrow_back),
//onPressed:() => Navigator.pop(context, false),
onPressed:() => {
Navigator.pop(context)
}
) )
), ),
theme: ThemeData(
appBarTheme: const AppBarTheme(
backgroundColor: Colors.cyan,
elevation: 0,
),
inputDecorationTheme: const InputDecorationTheme(
border: OutlineInputBorder(),
focusedBorder: OutlineInputBorder(),
labelStyle: TextStyle(
color: Colors.white,
fontSize: 30,
),
filled: true,
fillColor: Colors.white,
),
body: const SafeArea(
child: LoginWidget(),
), ),
); );
} }
@ -195,10 +173,14 @@ class _LoginWidgetState extends State<LoginWidget> {
usernameController.text, usernameController.text,
passwordController.text, passwordController.text,
).then((value) { ).then((value) {
/*
Navigator.of(context).popUntil((route) { Navigator.of(context).popUntil((route) {
print(route.isFirst); print(route.isFirst);
return route.isFirst; return route.isFirst;
}); });
*/
Navigator.pushNamedAndRemoveUntil(context, '/home', ModalRoute.withName('/home'));
}).catchError((error) { }).catchError((error) {
print(error); // TODO: Show error on interface print(error); // TODO: Show error on interface
}); });


+ 16
- 36
mobile/lib/views/authentication/signup.dart View File

@ -4,7 +4,7 @@ import 'package:flutter/material.dart';
import 'package:http/http.dart' as http; import 'package:http/http.dart' as http;
import 'package:shared_preferences/shared_preferences.dart'; import 'package:shared_preferences/shared_preferences.dart';
import '/views/main/conversations_list.dart';
import '/views/main/conversation_list.dart';
import '/utils/encryption/rsa_key_helper.dart'; import '/utils/encryption/rsa_key_helper.dart';
import '/utils/encryption/aes_helper.dart'; import '/utils/encryption/aes_helper.dart';
@ -71,43 +71,23 @@ class Signup extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return MaterialApp(
title: _title,
home: Scaffold(
backgroundColor: Colors.cyan,
appBar: AppBar(
title: null,
automaticallyImplyLeading: true,
//`true` if you want Flutter to automatically add Back Button when needed,
//or `false` if you want to force your own back button every where
leading: IconButton(icon: const Icon(Icons.arrow_back),
//onPressed:() => Navigator.pop(context, false),
onPressed:() => {
Navigator.pop(context)
}
)
),
body: const SafeArea(
child: SignupWidget(),
return Scaffold(
backgroundColor: Colors.cyan,
appBar: AppBar(
title: null,
automaticallyImplyLeading: true,
//`true` if you want Flutter to automatically add Back Button when needed,
//or `false` if you want to force your own back button every where
leading: IconButton(icon: const Icon(Icons.arrow_back),
//onPressed:() => Navigator.pop(context, false),
onPressed:() => {
Navigator.pop(context)
}
) )
), ),
theme: ThemeData(
appBarTheme: const AppBarTheme(
backgroundColor: Colors.cyan,
elevation: 0,
),
inputDecorationTheme: const InputDecorationTheme(
border: OutlineInputBorder(),
focusedBorder: OutlineInputBorder(),
labelStyle: TextStyle(
color: Colors.white,
fontSize: 30,
),
filled: true,
fillColor: Colors.white,
),
),
body: const SafeArea(
child: SignupWidget(),
)
); );
} }
} }


+ 56
- 0
mobile/lib/views/main/conversation_list.dart View File

@ -0,0 +1,56 @@
import 'package:flutter/material.dart';
import 'package:shared_preferences/shared_preferences.dart';
class ConversationList extends StatefulWidget {
const ConversationList({Key? key}) : super(key: key);
@override
State<ConversationList> createState() => _ConversationListState();
}
class _ConversationListState extends State<ConversationList> {
final _suggestions = <String>[];
final _biggerFont = const TextStyle(fontSize: 18);
Widget list() {
if (_suggestions.isEmpty) {
return const Center(
child: Text('No Conversations'),
);
}
return ListView.builder(
itemCount: _suggestions.length,
padding: const EdgeInsets.all(16.0),
itemBuilder: /*1*/ (context, i) {
//if (i >= _suggestions.length) {
// TODO: Check for more conversations here. Remove the itemCount to use this section
//_suggestions.addAll(generateWordPairs().take(10)); /*4*/
//}
return Column(
children: [
ListTile(
title: Text(
_suggestions[i],
style: _biggerFont,
),
),
const Divider(),
]
);
},
);
}
@override
Widget build(BuildContext context) {
return Scaffold(
appBar: AppBar(
title: const Text('Envelope'),
),
body: list(),
);
}
}

+ 0
- 112
mobile/lib/views/main/conversations_list.dart View File

@ -1,112 +0,0 @@
import 'package:flutter/material.dart';
import 'package:shared_preferences/shared_preferences.dart';
import 'package:font_awesome_flutter/font_awesome_flutter.dart';
import '/views/authentication/unauthenticated_landing.dart';
class ConversationsList extends StatefulWidget {
const ConversationsList({Key? key}) : super(key: key);
@override
State<ConversationsList> createState() => _ConversationsListState();
}
class _ConversationsListState extends State<ConversationsList> {
@override
void initState() {
checkLogin();
super.initState();
}
final _suggestions = <String>[];
final _biggerFont = const TextStyle(fontSize: 18);
Future checkLogin() async {
SharedPreferences preferences = await SharedPreferences.getInstance();
print(preferences.getBool('islogin'));
if (preferences.getBool('islogin') != true) {
setState(() {
Navigator.of(context).push(MaterialPageRoute(
builder: (context) => const UnauthenticatedLandingWidget(),
));
});
}
}
Widget list() {
if (_suggestions.isEmpty) {
return const Center(
child: Text('No Conversations'),
);
}
return ListView.builder(
itemCount: _suggestions.length,
padding: const EdgeInsets.all(16.0),
itemBuilder: /*1*/ (context, i) {
//if (i >= _suggestions.length) {
// TODO: Check for more conversations here. Remove the itemCount to use this section
//_suggestions.addAll(generateWordPairs().take(10)); /*4*/
//}
return Column(
children: [
ListTile(
title: Text(
_suggestions[i],
style: _biggerFont,
),
),
const Divider(),
]
);
},
);
}
@override
Widget build(BuildContext context) {
return WillPopScope(
onWillPop: () async => false,
child: Scaffold(
appBar: AppBar(
title: Text('Envelope'),
actions: <Widget>[
PopupMenuButton(
icon: const FaIcon(FontAwesomeIcons.ellipsisVertical, color: Colors.white, size: 40),
itemBuilder: (context) => [
const PopupMenuItem<int>(
value: 0,
child: Text("Settings"),
),
const PopupMenuItem<int>(
value: 1,
child: Text("Logout"),
),
],
onSelected: (item) => selectedMenuItem(context, item),
),
],
),
body: list(),
),
);
}
void selectedMenuItem(BuildContext context, item) async {
switch (item) {
case 0:
print("Settings");
break;
case 1:
SharedPreferences preferences = await SharedPreferences.getInstance();
preferences.setBool('islogin', false);
Navigator.of(context).push(MaterialPageRoute(
builder: (context) => const UnauthenticatedLandingWidget(),
));
break;
}
}
}

+ 105
- 0
mobile/lib/views/main/friend_list.dart View File

@ -0,0 +1,105 @@
import 'package:flutter/material.dart';
import '/models/friends.dart';
import '/views/main/friend_list_item.dart';
class FriendList extends StatefulWidget {
const FriendList({Key? key}) : super(key: key);
@override
State<FriendList> createState() => _FriendListState();
}
class _FriendListState extends State<FriendList> {
List<Friend> friends = [
Friend(id: 'abc', username: 'Test1'),
Friend(id: 'abc', username: 'Test2'),
Friend(id: 'abc', username: 'Test3'),
Friend(id: 'abc', username: 'Test4'),
Friend(id: 'abc', username: 'Test5'),
];
Widget list() {
if (friends.isEmpty) {
return const Center(
child: Text('No Friends'),
);
}
return ListView.builder(
itemCount: friends.length,
shrinkWrap: true,
padding: const EdgeInsets.only(top: 16),
physics: const NeverScrollableScrollPhysics(),
itemBuilder: (context, i) {
return FriendListItem(
id: friends[i].id,
username: friends[i].username,
);
},
);
}
@override
Widget build(BuildContext context) {
return Scaffold(
body: SingleChildScrollView(
physics: const BouncingScrollPhysics(),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
SafeArea(
child: Padding(
padding: const EdgeInsets.only(left: 16,right: 16,top: 10),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: <Widget>[
const Text("Friends",style: TextStyle(fontSize: 32,fontWeight: FontWeight.bold),),
Container(
padding: const EdgeInsets.only(left: 8,right: 8,top: 2,bottom: 2),
height: 30,
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(30),
color: Colors.pink[50],
),
child: Row(
children: const <Widget>[
Icon(Icons.add,color: Colors.pink,size: 20,),
SizedBox(width: 2,),
Text("Add",style: TextStyle(fontSize: 14,fontWeight: FontWeight.bold),),
],
),
)
],
),
),
),
Padding(
padding: const EdgeInsets.only(top: 16,left: 16,right: 16),
child: TextField(
decoration: InputDecoration(
hintText: "Search...",
hintStyle: TextStyle(color: Colors.grey.shade600),
prefixIcon: Icon(Icons.search,color: Colors.grey.shade600, size: 20,),
filled: true,
fillColor: Colors.grey.shade100,
contentPadding: const EdgeInsets.all(8),
enabledBorder: OutlineInputBorder(
borderRadius: BorderRadius.circular(20),
borderSide: BorderSide(
color: Colors.grey.shade100
)
),
),
),
),
Padding(
padding: const EdgeInsets.only(top: 16,left: 16,right: 16),
child: list(),
),
],
),
),
);
}
}

+ 56
- 0
mobile/lib/views/main/friend_list_item.dart View File

@ -0,0 +1,56 @@
import 'package:flutter/material.dart';
class FriendListItem extends StatefulWidget{
final String id;
final String username;
const FriendListItem({
Key? key,
required this.id,
required this.username,
}) : super(key: key);
@override
_FriendListItemState createState() => _FriendListItemState();
}
class _FriendListItemState extends State<FriendListItem> {
@override
Widget build(BuildContext context) {
return GestureDetector(
onTap: (){
},
child: Container(
padding: const EdgeInsets.only(left: 16,right: 16,top: 10,bottom: 10),
child: Row(
children: <Widget>[
Expanded(
child: Row(
children: <Widget>[
// CircleAvatar(
// backgroundImage: NetworkImage(widget.imageUrl),
// maxRadius: 30,
// ),
//const SizedBox(width: 16),
Expanded(
child: Container(
color: Colors.transparent,
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Text(widget.username, style: const TextStyle(fontSize: 16)),
const SizedBox(height: 6),
//Text(widget.messageText,style: TextStyle(fontSize: 13,color: Colors.grey.shade600, fontWeight: widget.isMessageRead?FontWeight.bold:FontWeight.normal),),
const Divider(),
],
),
),
),
],
),
),
],
),
),
);
}
}

+ 72
- 0
mobile/lib/views/main/home.dart View File

@ -0,0 +1,72 @@
import 'package:flutter/material.dart';
import 'package:shared_preferences/shared_preferences.dart';
import '/views/main/conversation_list.dart';
import '/views/main/friend_list.dart';
class Home extends StatefulWidget {
const Home({Key? key}) : super(key: key);
@override
State<Home> createState() => _HomeState();
}
class _HomeState extends State<Home> {
@override
void initState() {
checkLogin();
super.initState();
}
Future checkLogin() async {
SharedPreferences preferences = await SharedPreferences.getInstance();
if (preferences.getBool('islogin') != true) {
Navigator.pushNamedAndRemoveUntil(context, '/landing', ModalRoute.withName('/landing'));
}
}
int _selectedIndex = 0;
static const List<Widget> _widgetOptions = <Widget>[
ConversationList(),
FriendList(),
Text('Not Implemented'),
];
void _onItemTapped(int index) {
setState(() {
_selectedIndex = index;
});
}
@override
Widget build(BuildContext context) {
return WillPopScope(
onWillPop: () async => false,
child: Scaffold(
body: _widgetOptions.elementAt(_selectedIndex),
bottomNavigationBar: BottomNavigationBar(
currentIndex: _selectedIndex,
onTap: _onItemTapped,
selectedItemColor: Colors.red,
unselectedItemColor: Colors.grey.shade600,
selectedLabelStyle: const TextStyle(fontWeight: FontWeight.w600),
unselectedLabelStyle: const TextStyle(fontWeight: FontWeight.w600),
type: BottomNavigationBarType.fixed,
items: const [
BottomNavigationBarItem(
icon: Icon(Icons.message),
label: "Chats",
),
BottomNavigationBarItem(
icon: Icon(Icons.group_work),
label: "Friends",
),
BottomNavigationBarItem(
icon: Icon(Icons.account_box),
label: "Profile",
),
],
),
),
);
}
}

+ 9
- 9
mobile/pubspec.lock View File

@ -49,7 +49,7 @@ packages:
name: collection name: collection
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.15.0"
version: "1.16.0"
convert: convert:
dependency: transitive dependency: transitive
description: description:
@ -70,7 +70,7 @@ packages:
name: fake_async name: fake_async
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.2.0"
version: "1.3.0"
ffi: ffi:
dependency: transitive dependency: transitive
description: description:
@ -134,7 +134,7 @@ packages:
name: js name: js
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.6.3"
version: "0.6.4"
lints: lints:
dependency: transitive dependency: transitive
description: description:
@ -155,7 +155,7 @@ packages:
name: material_color_utilities name: material_color_utilities
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.1.3"
version: "0.1.4"
meta: meta:
dependency: transitive dependency: transitive
description: description:
@ -169,7 +169,7 @@ packages:
name: path name: path
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.8.0"
version: "1.8.1"
path_provider_linux: path_provider_linux:
dependency: transitive dependency: transitive
description: description:
@ -286,7 +286,7 @@ packages:
name: source_span name: source_span
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.8.1"
version: "1.8.2"
stack_trace: stack_trace:
dependency: transitive dependency: transitive
description: description:
@ -321,7 +321,7 @@ packages:
name: test_api name: test_api
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.4.8"
version: "0.4.9"
typed_data: typed_data:
dependency: transitive dependency: transitive
description: description:
@ -335,7 +335,7 @@ packages:
name: vector_math name: vector_math
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "2.1.1"
version: "2.1.2"
win32: win32:
dependency: transitive dependency: transitive
description: description:
@ -351,5 +351,5 @@ packages:
source: hosted source: hosted
version: "0.2.0+1" version: "0.2.0+1"
sdks: sdks:
dart: ">=2.16.2 <3.0.0"
dart: ">=2.17.0-0 <3.0.0"
flutter: ">=2.8.0" flutter: ">=2.8.0"

+ 8
- 0
mobile/windows/flutter/generated_plugins.cmake View File

@ -5,6 +5,9 @@
list(APPEND FLUTTER_PLUGIN_LIST list(APPEND FLUTTER_PLUGIN_LIST
) )
list(APPEND FLUTTER_FFI_PLUGIN_LIST
)
set(PLUGIN_BUNDLED_LIBRARIES) set(PLUGIN_BUNDLED_LIBRARIES)
foreach(plugin ${FLUTTER_PLUGIN_LIST}) foreach(plugin ${FLUTTER_PLUGIN_LIST})
@ -13,3 +16,8 @@ foreach(plugin ${FLUTTER_PLUGIN_LIST})
list(APPEND PLUGIN_BUNDLED_LIBRARIES $<TARGET_FILE:${plugin}_plugin>) list(APPEND PLUGIN_BUNDLED_LIBRARIES $<TARGET_FILE:${plugin}_plugin>)
list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${plugin}_bundled_libraries}) list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${plugin}_bundled_libraries})
endforeach(plugin) endforeach(plugin)
foreach(ffi_plugin ${FLUTTER_FFI_PLUGIN_LIST})
add_subdirectory(flutter/ephemeral/.plugin_symlinks/${ffi_plugin}/windows plugins/${ffi_plugin})
list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${ffi_plugin}_bundled_libraries})
endforeach(ffi_plugin)

Write Preview
Loading…
Cancel
Save