aiden
/
fluffychat
mirror of https://github.com/krille-chan/fluffychat
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix message types and update to newest sdk

Browse Source
onboarding
Christian Pauly 6 years ago committed by Marcel
parent e97a5319d9
commit fda9b752df
8 changed files with 149 additions and 132 deletions
Show Stats Download Patch File Download Diff File

4
lib/components/list_items/message.dart
Unescape Escape View File

@ -16,7 +16,9 @@ class Message extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
if (event.typeKey != "m.room.message") return StateMessage(event); if (![EventTypes.Message, EventTypes.Sticker].contains(event.type)) {
return StateMessage(event);
}
Client client = Matrix.of(context).client; Client client = Matrix.of(context).client;
final bool ownMessage = event.senderId == client.userID; final bool ownMessage = event.senderId == client.userID;

35
lib/components/matrix.dart
Unescape Escape View File

@ -131,24 +131,29 @@ class MatrixState extends State<Matrix> {
StreamSubscription onSetupFirebase; StreamSubscription onSetupFirebase;
void setupFirebase(LoginState login) { void setupFirebase(LoginState login) async {
if (login != LoginState.logged) return; if (login != LoginState.logged) return;
if (Platform.isIOS) iOS_Permission(); if (Platform.isIOS) iOS_Permission();
_firebaseMessaging.getToken().then((token) { final String token = await _firebaseMessaging.getToken();
print("Der token ist: $token"); if (token?.isEmpty ?? true) {
client.setPushers( return Toast.show(
token, "Push notifications disabled.",
"http", context,
"chat.fluffy.fluffychat", duration: Toast.LENGTH_LONG,
"FluffyChat",
client.deviceName,
"en",
"https://janian.de:7023/",
append: false,
format: "event_id_only",
); );
}); }
await client.setPushers(
token,
"http",
"chat.fluffy.fluffychat",
widget.clientName,
client.deviceName,
"en",
"https://janian.de:7023/",
append: false,
format: "event_id_only",
);
_firebaseMessaging.configure( _firebaseMessaging.configure(
onResume: (Map<String, dynamic> message) async { onResume: (Map<String, dynamic> message) async {
@ -172,7 +177,7 @@ class MatrixState extends State<Matrix> {
@override @override
void initState() { void initState() {
if (widget.client == null) { if (widget.client == null) {
client = Client(widget.clientName, debug: true); client = Client(widget.clientName, debug: false);
if (!kIsWeb) { if (!kIsWeb) {
client.store = Store(client); client.store = Store(client);
} else { } else {

209
lib/components/message_content.dart
Unescape Escape View File

@ -3,7 +3,6 @@ import 'package:cached_network_image/cached_network_image.dart';
import 'package:famedlysdk/famedlysdk.dart'; import 'package:famedlysdk/famedlysdk.dart';
import 'package:flutter/foundation.dart'; import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:link_text/link_text.dart';
import 'package:url_launcher/url_launcher.dart'; import 'package:url_launcher/url_launcher.dart';
import 'matrix.dart'; import 'matrix.dart';
@ -19,102 +18,112 @@ class MessageContent extends StatelessWidget {
Widget build(BuildContext context) { Widget build(BuildContext context) {
final int maxLines = textOnly ? 1 : null; final int maxLines = textOnly ? 1 : null;
final Widget unknown = Text(
"${event.sender.calcDisplayname()} sent a ${event.typeKey} event",
maxLines: maxLines,
overflow: textOnly ? TextOverflow.ellipsis : null,
style: TextStyle(
color: textColor,
decoration: event.redacted ? TextDecoration.lineThrough : null,
),
);
switch (event.type) { switch (event.type) {
case EventTypes.Image: case EventTypes.Message:
if (textOnly) { case EventTypes.Sticker:
return Text( switch (event.messageType) {
"${event.sender.calcDisplayname()} has sent an image", case MessageTypes.Image:
maxLines: maxLines, case MessageTypes.Sticker:
style: TextStyle( if (textOnly) {
color: textColor, return Text(
decoration: event.redacted ? TextDecoration.lineThrough : null, "${event.sender.calcDisplayname()} has sent an image",
), maxLines: maxLines,
); style: TextStyle(
} color: textColor,
final int size = 400; decoration:
final String src = MxContent(event.content["url"]).getThumbnail( event.redacted ? TextDecoration.lineThrough : null,
Matrix.of(context).client, ),
width: size * MediaQuery.of(context).devicePixelRatio, );
height: size * MediaQuery.of(context).devicePixelRatio, }
method: ThumbnailMethod.scale, final int size = 400;
); final String src = MxContent(event.content["url"]).getThumbnail(
return Bubble( Matrix.of(context).client,
padding: BubbleEdges.all(0), width: size * MediaQuery.of(context).devicePixelRatio,
radius: Radius.circular(10), height: size * MediaQuery.of(context).devicePixelRatio,
elevation: 0, method: ThumbnailMethod.scale,
child: InkWell( );
onTap: () => launch( return Bubble(
MxContent(event.content["url"]) padding: BubbleEdges.all(0),
.getDownloadLink(Matrix.of(context).client), radius: Radius.circular(10),
), elevation: 0,
child: kIsWeb child: InkWell(
? Image.network( onTap: () => launch(
src, MxContent(event.content["url"])
width: size.toDouble(), .getDownloadLink(Matrix.of(context).client),
) ),
: CachedNetworkImage( child: kIsWeb
imageUrl: src, ? Image.network(
width: size.toDouble(), src,
), width: size.toDouble(),
), )
); : CachedNetworkImage(
case EventTypes.Audio: imageUrl: src,
case EventTypes.File: width: size.toDouble(),
case EventTypes.Video: ),
return Container( ),
width: 200, );
child: RaisedButton( case MessageTypes.Audio:
color: Colors.blueGrey, case MessageTypes.File:
child: Text( case MessageTypes.Video:
"Download ${event.getBody()}", return Container(
overflow: TextOverflow.fade, width: 200,
softWrap: false, child: RaisedButton(
maxLines: 1, color: Colors.blueGrey,
), child: Text(
onPressed: () => launch( "Download ${event.getBody()}",
MxContent(event.content["url"]) overflow: TextOverflow.fade,
.getDownloadLink(Matrix.of(context).client), softWrap: false,
), maxLines: 1,
), ),
); onPressed: () => launch(
case EventTypes.Text: MxContent(event.content["url"])
case EventTypes.Reply: .getDownloadLink(Matrix.of(context).client),
case EventTypes.Notice: ),
final String senderPrefix = ),
textOnly && event.senderId != event.room.directChatMatrixID );
? event.senderId == Matrix.of(context).client.userID case MessageTypes.Text:
? "You: " case MessageTypes.Reply:
: "${event.sender.calcDisplayname()}: " case MessageTypes.Location:
: ""; case MessageTypes.None:
if (textOnly) { case MessageTypes.Notice:
return Text( final String senderPrefix =
senderPrefix + event.getBody(), textOnly && event.senderId != event.room.directChatMatrixID
maxLines: maxLines, ? event.senderId == Matrix.of(context).client.userID
overflow: TextOverflow.ellipsis, ? "You: "
style: TextStyle( : "${event.sender.calcDisplayname()}: "
color: textColor, : "";
decoration: event.redacted ? TextDecoration.lineThrough : null, return Text(
), senderPrefix + event.getBody(),
); maxLines: maxLines,
overflow: textOnly ? TextOverflow.ellipsis : null,
style: TextStyle(
color: textColor,
decoration: event.redacted ? TextDecoration.lineThrough : null,
),
);
case MessageTypes.Emote:
return Text(
"* " + event.getBody(),
maxLines: maxLines,
overflow: textOnly ? TextOverflow.ellipsis : null,
style: TextStyle(
color: textColor,
fontStyle: FontStyle.italic,
decoration: event.redacted ? TextDecoration.lineThrough : null,
),
);
} }
return LinkText( return unknown;
text: senderPrefix + event.getBody(),
textStyle: TextStyle(
color: textColor,
decoration: event.redacted ? TextDecoration.lineThrough : null,
),
);
case EventTypes.Emote:
return Text(
"* " + event.getBody(),
maxLines: maxLines,
overflow: textOnly ? TextOverflow.ellipsis : null,
style: TextStyle(
color: textColor,
fontStyle: FontStyle.italic,
decoration: event.redacted ? TextDecoration.lineThrough : null,
),
);
case EventTypes.RoomCreate: case EventTypes.RoomCreate:
return Text( return Text(
"${event.sender.calcDisplayname()} has created the chat", "${event.sender.calcDisplayname()} has created the chat",
@ -272,15 +281,7 @@ class MessageContent extends StatelessWidget {
), ),
); );
default: default:
return Text( return unknown;
"${event.sender.calcDisplayname()} sent a ${event.typeKey} event",
maxLines: maxLines,
overflow: textOnly ? TextOverflow.ellipsis : null,
style: TextStyle(
color: textColor,
decoration: event.redacted ? TextDecoration.lineThrough : null,
),
);
} }
} }
} }

4
lib/main.dart
Unescape Escape View File

@ -17,9 +17,9 @@ class App extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Matrix( return Matrix(
clientName: "FluffyWeb", clientName: "FluffyChat",
child: MaterialApp( child: MaterialApp(
title: 'FluffyWeb', title: 'FluffyChat',
theme: ThemeData( theme: ThemeData(
brightness: Brightness.light, brightness: Brightness.light,
primaryColor: Color(0xFF5625BA), primaryColor: Color(0xFF5625BA),

1
lib/utils/sqflite_store.dart
Unescape Escape View File

@ -411,6 +411,7 @@ class Store extends StoreAPI {
res[i], res[i],
client, client,
states: getStatesFromRoomId(res[i]["room_id"]), states: getStatesFromRoomId(res[i]["room_id"]),
roomAccountData: getAccountDataFromRoomId(res[i]["room_id"]),
); );
roomList.add(room); roomList.add(room);
} }

22
lib/views/chat_details.dart
Unescape Escape View File

@ -1,3 +1,4 @@
import 'dart:async';
import 'dart:io'; import 'dart:io';
import 'package:famedlysdk/famedlysdk.dart'; import 'package:famedlysdk/famedlysdk.dart';
@ -27,11 +28,10 @@ class _ChatDetailsState extends State<ChatDetails> {
List<User> members; List<User> members;
void setDisplaynameAction(BuildContext context, String displayname) async { void setDisplaynameAction(BuildContext context, String displayname) async {
final MatrixState matrix = Matrix.of(context); final MatrixState matrix = Matrix.of(context);
final Map<String, dynamic> success = final success = await matrix.tryRequestWithLoadingDialog(
await matrix.tryRequestWithLoadingDialog(
widget.room.setName(displayname), widget.room.setName(displayname),
); );
if (success != null && success.isEmpty) { if (success != false) {
Toast.show( Toast.show(
"Displayname has been changed", "Displayname has been changed",
context, context,
@ -48,8 +48,7 @@ class _ChatDetailsState extends State<ChatDetails> {
maxHeight: 1600); maxHeight: 1600);
if (tempFile == null) return; if (tempFile == null) return;
final MatrixState matrix = Matrix.of(context); final MatrixState matrix = Matrix.of(context);
final Map<String, dynamic> success = final success = await matrix.tryRequestWithLoadingDialog(
await matrix.tryRequestWithLoadingDialog(
widget.room.setAvatar( widget.room.setAvatar(
MatrixFile( MatrixFile(
bytes: await tempFile.readAsBytes(), bytes: await tempFile.readAsBytes(),
@ -57,7 +56,7 @@ class _ChatDetailsState extends State<ChatDetails> {
), ),
), ),
); );
if (success != null && success.isEmpty) { if (success != false) {
Toast.show( Toast.show(
"Avatar has been changed", "Avatar has been changed",
context, context,
@ -72,13 +71,22 @@ class _ChatDetailsState extends State<ChatDetails> {
if (participants != null) setState(() => members = participants); if (participants != null) setState(() => members = participants);
} }
StreamSubscription onUpdate;
@override
void dispose() {
onUpdate?.cancel();
super.dispose();
}
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
members ??= widget.room.getParticipants(); members ??= widget.room.getParticipants();
final int actualMembersCount = final int actualMembersCount =
widget.room.mInvitedMemberCount + widget.room.mJoinedMemberCount; widget.room.mInvitedMemberCount + widget.room.mJoinedMemberCount;
final bool canRequestMoreMembers = members.length < actualMembersCount; final bool canRequestMoreMembers = members.length < actualMembersCount;
widget.room.onUpdate = () => setState(() => members = null); this.onUpdate ??= widget.room.onUpdate.stream
.listen((id) => setState(() => members = null));
return AdaptivePageLayout( return AdaptivePageLayout(
primaryPage: FocusPage.SECOND, primaryPage: FocusPage.SECOND,
firstScaffold: ChatList( firstScaffold: ChatList(

4
pubspec.lock
Unescape Escape View File

@ -82,8 +82,8 @@ packages:
dependency: "direct main" dependency: "direct main"
description: description:
path: "." path: "."
ref: c78330ea58c36eec197803eb461681d84fa50f42 ref: "90a06ebce547ed853e501532a03491356a93e483"
resolved-ref: c78330ea58c36eec197803eb461681d84fa50f42 resolved-ref: "90a06ebce547ed853e501532a03491356a93e483"
url: "https://gitlab.com/famedly/famedlysdk.git" url: "https://gitlab.com/famedly/famedlysdk.git"
source: git source: git
version: "0.0.1" version: "0.0.1"

2
pubspec.yaml
Unescape Escape View File

@ -27,7 +27,7 @@ dependencies:
famedlysdk: famedlysdk:
git: git:
url: https://gitlab.com/famedly/famedlysdk.git url: https://gitlab.com/famedly/famedlysdk.git
ref: c78330ea58c36eec197803eb461681d84fa50f42 ref: ae1c757e4ec3e7a41a2471e471d7ae47d974e821
localstorage: ^3.0.1+4 localstorage: ^3.0.1+4
bubble: ^1.1.9+1 bubble: ^1.1.9+1

Write Preview
Loading…
Cancel
Save