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

A few small fixes from user feedback.
continuous-integration/drone/pr Build is passing Details 

Fixes: #115
Fixes: #119
This commit is contained in:
Sarah Jamie Lewis 2021-06-01 18:21:32 -07:00
parent 6a01e94846
commit cd3af06d3d
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/model.dart
View File

@ -456,7 +456,6 @@ class MessageState extends ChangeNotifier {
} else {
var parts = message['d'].toString().split("||");
if (parts.length == 2) {
print("jsondecoding: " + utf8.fuse(base64).decode(parts[1].substring(5)));
var jsonObj = jsonDecode(utf8.fuse(base64).decode(parts[1].substring(5)));
this._inviteTarget = jsonObj['GroupID'];
this._inviteNick = jsonObj['GroupName'];

4
lib/views/globalsettingsview.dart
View File

@ -1,4 +1,5 @@
import 'dart:convert';
import 'dart:io';
import 'package:package_info_plus/package_info_plus.dart';
import 'package:flutter/material.dart';
import 'package:cwtch/opaque.dart';
@ -89,7 +90,8 @@ class _GlobalSettingsViewState extends State<GlobalSettingsView> {
Provider.of<FlwtchState>(context).columns = [1];
}
},
items: ["Single", "Double (1:2)", "Double (1:4)"].map<DropdownMenuItem<String>>((String value) {
// TODO: Only allow in landscape?
items: (Platform.isAndroid ? ["Single"] : ["Single", "Double (1:2)", "Double (1:4)"]).map<DropdownMenuItem<String>>((String value) {
return DropdownMenuItem<String>(
value: value,
child: Text(value),

2
lib/widgets/contactrow.dart
View File

@ -132,6 +132,6 @@ class _ContactRowState extends State<ContactRow> {
return DateFormat.yMd().format(date.toLocal());
}
// Otherwise just state the time.
return DateFormat.Hms().format(date.toLocal());
return DateFormat.Hm().format(date.toLocal());
}
}