flutter
/
flutter_app
6
1
Fork 0
Code Issues 14 Pull Requests Releases 1 Wiki Activity

Merge branch 'trunk' into settings-pane

This commit is contained in:
erinn 2021-03-16 16:29:14 -07:00
parent 3f8004311c 209f03ab6a
commit 26637af08d
10 changed files with 98 additions and 124 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
lib/cwtch/cwtchNotifier.dart
View File

@ -23,13 +23,38 @@ class CwtchNotifier {
profileCN.add(ProfileInfoState(
onion: data["Identity"],
nickname: data["name"],
imagePath: data["picture"]));
imagePath: data["picture"],
contactsJson: data["ContactsJson"],
));
break;
case "PeerCreated":
print("xx peercreated");
profileCN.getProfile(data["ProfileOnion"]).contactList.add(ContactInfoState(
profileOnion: data["ProfileOnion"],
onion: data["RemotePeer"],
nickname: data["nick"],
status: data["status"],
));
break;
case "PeerStateChange":
ContactInfoState contact = profileCN.getProfile(data["ProfileOnion"]).contactList.getContact(data["RemotePeer"]);
if (contact == null) {//todo: stopgap, as lc-g is supposed to handle this
print("PSC -> adding "+data["ProfileOnion"]+" :: " + data["RemotePeer"]);
profileCN.getProfile(data["ProfileOnion"]).contactList.add(ContactInfoState(
profileOnion: data["ProfileOnion"],
onion: data["RemotePeer"],
nickname: data["nick"],
status: data["ConnectionState"],
));
} else {
contact.status = data["ConnectionState"];
}
break;
case "UpdateGlobalSettings":
settings.handleUpdate(jsonDecode(data["Data"]));
break;
default:
print("unhandled gomobile appbus event: ${type}");
print("unhandled event: $type");
}
}
}

1
lib/cwtch/gomobile.dart
View File

@ -56,7 +56,6 @@ class CwtchGomobile implements Cwtch {
Future<void> _handleAppbusEvent(MethodCall call) async {
final String json = call.arguments;
var obj = jsonDecode(json);
cwtchNotifier.handleMessage(call.method, obj);
}

99
lib/model.dart
View File

@ -69,87 +69,84 @@ class ChatMessage {
///////////////////
class ProfileListState extends ChangeNotifier {
List<ProfileInfoState> _onions = [];
int get num => _onions.length;
List<ProfileInfoState> _profiles = [];
int get num => _profiles.length;
void addAll(Iterable<ProfileInfoState> newOnions) {
_onions.addAll(newOnions);
void addAll(Iterable<ProfileInfoState> newProfiles) {
_profiles.addAll(newProfiles);
notifyListeners();
}
void add(ProfileInfoState newOnion) {
print("ProfileListState: adding " + newOnion.onion + " and notifying");
_onions.add(newOnion);
void add(ProfileInfoState newProfile) {
print("ProfileListState: adding " + newProfile.onion +" and notifying");
_profiles.add(newProfile);
notifyListeners();
}
List<ProfileInfoState> get onions => _onions
.sublist(0); //todo: copy?? dont want caller able to bypass changenotifier
List<ProfileInfoState> get profiles => _profiles.sublist(0);//todo: copy?? dont want caller able to bypass changenotifier
ProfileInfoState getProfile(String onion) {
int idx = _profiles.indexWhere((element) => element.onion == onion);
return idx >= 0 ? _profiles[idx] : null;
}
}
class ContactListState extends ChangeNotifier {
List<ContactInfoState> _onions = [];
int get num => _onions.length;
List<ContactInfoState> _contacts = [];
int get num => _contacts.length;
ContactListState(Cwtch cwtch, String profileOnion) {
cwtch.GetContacts(profileOnion).then((jsonStr) {
if (jsonStr == null) return;
print("contacts: " + jsonStr);
List<dynamic> contacts = jsonDecode(jsonStr);
contacts.forEach((c) {
add(ContactInfoState(
profileOnion: profileOnion,
onion: c["onion"],
nickname: c["name"],
isGroup: false,
isInvitation: false,
isBlocked: false,
status: c["status"],
imagePath: "",
));
});
});
}
void addAll(Iterable<ContactInfoState> newOnions) {
_onions.addAll(newOnions);
void addAll(Iterable<ContactInfoState> newContacts) {
_contacts.addAll(newContacts);
notifyListeners();
}
void add(ContactInfoState newOnion) {
_onions.add(newOnion);
void add(ContactInfoState newContact) {
_contacts.add(newContact);
notifyListeners();
}
void updateUnreadMessages(String forOnion, int newVal) {
_onions.sort((ContactInfoState a, ContactInfoState b) {
return b.unreadMessages - a.unreadMessages;
});
_contacts.sort((ContactInfoState a, ContactInfoState b) { return b.unreadMessages - a.unreadMessages; });
//<todo> if(changed) {
notifyListeners();
//} </todo>
}
List<ContactInfoState> get onions => _onions
.sublist(0); //todo: copy?? dont want caller able to bypass changenotifier
List<ContactInfoState> get contacts => _contacts.sublist(0);//todo: copy?? dont want caller able to bypass changenotifier
ContactInfoState getContact(String onion) {
int idx = _contacts.indexWhere((element) => element.onion == onion);
return idx >= 0 ? _contacts[idx] : null;
}
}
class ProfileInfoState extends ChangeNotifier {
ContactListState _contacts = ContactListState();
final String onion;
String _nickname = "";
String _imagePath = "";
int _unreadMessages = 0;
ProfileInfoState({
this.onion,
nickname = "",
imagePath = "",
unreadMessages = 0,
}) {
ProfileInfoState({this.onion, nickname = "", imagePath = "", unreadMessages = 0, contactsJson = "",}){
this._nickname = nickname;
this._imagePath = imagePath;
this._unreadMessages = unreadMessages;
if (contactsJson != null && contactsJson != "" && contactsJson != "null") {
print("decoding " + contactsJson);
List<dynamic> contacts = jsonDecode(contactsJson);
this._contacts.addAll(
contacts.map((contact){
return ContactInfoState(
profileOnion: this.onion,
onion: contact["onion"],
nickname: contact["name"],
status: contact["status"],
imagePath: contact["picture"],
);
})
);
}
}
String get nickname => this._nickname;
@ -170,6 +167,8 @@ class ProfileInfoState extends ChangeNotifier {
notifyListeners();
}
ContactListState get contactList => this._contacts;
@override
void dispose() {
super.dispose();
@ -229,6 +228,12 @@ class ContactInfoState extends ChangeNotifier {
this._unreadMessages = newVal;
notifyListeners();
}
get imagePath => this._imagePath;
set imagePath(String newVal) {
this._imagePath = newVal;
notifyListeners();
}
}
/////////////

46
lib/views/contactsview.dart
View File

@ -14,27 +14,6 @@ class ContactsView extends StatefulWidget {
}
class _ContactsViewState extends State<ContactsView> {
_ContactsViewState();
// Map<String, ContactModel> _contacts = new HashMap<String, ContactModel>();
// @override
// void didChangeDependencies() {
// super.didChangeDependencies();
//
// Provider.of<ContactListState>(context).onions.forEach((contact) {
// _contacts.putIfAbsent(contact.onion, () => ContactModel(contact);
// });
// .cwtch.GetContacts(widget.profile.onion).then((jsonContacts) {
// print("got contact: $jsonContacts");
// setState(() {
// List<dynamic> contacts = jsonDecode(jsonContacts);
// contacts.forEach((onion) {
// _contacts.putIfAbsent(onion['onion'], () => ContactModel(onion: onion['onion'], nickname: onion['name'], status: onion['status']));
// });
// });
// });
// }
@override
Widget build(BuildContext context) {
return Scaffold(
@ -61,26 +40,11 @@ class _ContactsViewState extends State<ContactsView> {
}
Widget _buildContactList() {
return StreamBuilder<String>(
stream: Provider.of<FlwtchState>(context).appStatus.contactEvents(),
builder: (BuildContext context, AsyncSnapshot<String> snapshot) {
final tiles = Provider.of<ContactListState>(context).onions.map(
(ContactInfoState contact) {
return ChangeNotifierProvider<ContactInfoState>(
create: (context) => contact,
builder: (context, child) => ContactRow(),
);
},
);
final divided = ListTile.divideTiles(
context: context,
tiles: tiles,
).toList();
return ListView(children: divided);
},
);
final tiles = Provider.of<ContactListState>(context).contacts.map((ContactInfoState contact) {
return ChangeNotifierProvider<ContactInfoState>.value(value: contact, child: ContactRow());
});
final divided = ListTile.divideTiles(context: context, tiles: tiles, ).toList();
return ListView(children: divided);
}
void _pushAddContact() {

4
lib/views/profilemgrview.dart
View File

@ -50,7 +50,7 @@ class _ProfileMgrViewState extends State<ProfileMgrView> {
}
void _testChangingContactInfo() {
Provider.of<ProfileListState>(context, listen: false).notifyListeners();
Provider.of<ProfileListState>(context, listen:false).profiles.first.nickname = "yay!";
}
void _pushGlobalSettings() {
@ -116,7 +116,7 @@ class _ProfileMgrViewState extends State<ProfileMgrView> {
}
Widget _buildProfileManager() {
final tiles = Provider.of<ProfileListState>(context).onions.map(
final tiles = Provider.of<ProfileListState>(context).profiles.map(
(ProfileInfoState profile) {
return ChangeNotifierProvider<ProfileInfoState>.value(
value: profile,

14
lib/widgets/contactrow.dart
View File

@ -20,19 +20,7 @@ class _ContactRowState extends State<ContactRow> {
width: 60,
height: 60,
child: ClipOval(
child: SizedBox(
width: 60,
height: 60,
child: Container(
color: Colors.white,
width: 60,
height: 60,
child: Image(
image: AssetImage("assets/profiles/001-centaur.png"),
width: 50,
height: 50,
))),
//child: SizedBox(width:60, height:60, child:Container(color:Colors.white, width: 60, height: 60, child: Image(image: AssetImage(contact.imagePath), width:50,height:50,))),
child: SizedBox(width:60, height:60, child:Container(color:Colors.white, width: 60, height: 60, child: Image(image: AssetImage("assets/"+contact.imagePath), width:50,height:50,))),
),
),
trailing: contact.isInvitation != null && contact.isInvitation

6
lib/widgets/profilerow.dart
View File

@ -80,11 +80,7 @@ class _ProfileRowState extends State<ProfileRow> {
return MultiProvider(
providers: [
ChangeNotifierProvider<ProfileInfoState>.value(value: profile),
ChangeNotifierProvider<ContactListState>(
create: (_) => ContactListState(
Provider.of<FlwtchState>(buildcontext).cwtch,
profile.onion),
),
ChangeNotifierProvider<ContactListState>.value(value: profile.contactList),
],
builder: (context, widget) =>
includeDoublePane ? DoubleColumnView() : ContactsView(),

2
linux/flutter/generated_plugin_registrant.cc
View File

@ -2,6 +2,8 @@
// Generated file. Do not edit.
//
// clang-format off
#include "generated_plugin_registrant.h"

2
linux/flutter/generated_plugin_registrant.h
View File

@ -2,6 +2,8 @@
// Generated file. Do not edit.
//
// clang-format off
#ifndef GENERATED_PLUGIN_REGISTRANT_
#define GENERATED_PLUGIN_REGISTRANT_

19
pubspec.lock
View File

@ -115,7 +115,7 @@ packages:
name: flutter_lokalise
url: "https://pub.dartlang.org"
source: hosted
version: "0.1.3"
version: "0.1.4"
flutter_test:
dependency: "direct dev"
description: flutter
@ -132,7 +132,7 @@ packages:
name: freezed_annotation
url: "https://pub.dartlang.org"
source: hosted
version: "0.7.1"
version: "0.12.0"
http:
dependency: transitive
description:
@ -195,7 +195,7 @@ packages:
name: nested
url: "https://pub.dartlang.org"
source: hosted
version: "0.0.4"
version: "1.0.0"
package_info_plus:
dependency: "direct main"
description:
@ -286,7 +286,7 @@ packages:
name: pedantic
url: "https://pub.dartlang.org"
source: hosted
version: "1.10.0"
version: "1.11.0"
platform:
dependency: transitive
description:
@ -355,13 +355,6 @@ packages:
url: "https://pub.dartlang.org"
source: hosted
version: "1.1.0"
string_unescape:
dependency: transitive
description:
name: string_unescape
url: "https://pub.dartlang.org"
source: hosted
version: "1.5.1"
term_glyph:
dependency: transitive
description:
@ -396,7 +389,7 @@ packages:
name: win32
url: "https://pub.dartlang.org"
source: hosted
version: "2.0.0"
version: "2.0.4"
xdg_directories:
dependency: transitive
description:
@ -412,5 +405,5 @@ packages:
source: hosted
version: "2.2.1"
sdks:
dart: ">=2.12.0-259.9.beta <3.0.0"
dart: ">=2.12.0 <3.0.0"
flutter: ">=1.20.0"