Merge branch 'macNotifications' of git.openprivacy.ca:cwtch.im/cwtch-ui into macNotifications
continuous-integration/drone/pr Build is pending
Details
continuous-integration/drone/pr Build is pending
Details
This commit is contained in:
commit
018a51b76e
|
@ -218,7 +218,7 @@ class MainActivity: FlutterActivity() {
|
||||||
WorkManager.getInstance(this).enqueue(workRequest)
|
WorkManager.getInstance(this).enqueue(workRequest)
|
||||||
WorkManager.getInstance(applicationContext).getWorkInfoByIdLiveData(workRequest.id).observe(
|
WorkManager.getInstance(applicationContext).getWorkInfoByIdLiveData(workRequest.id).observe(
|
||||||
this, Observer { workInfo ->
|
this, Observer { workInfo ->
|
||||||
if (workInfo.state == WorkInfo.State.SUCCEEDED) {
|
if (workInfo != null && workInfo.state == WorkInfo.State.SUCCEEDED) {
|
||||||
val res = workInfo.outputData.keyValueMap.toString()
|
val res = workInfo.outputData.keyValueMap.toString()
|
||||||
result.success(workInfo.outputData.getString("result"))
|
result.success(workInfo.outputData.getString("result"))
|
||||||
}
|
}
|
||||||
|
|
|
@ -140,6 +140,7 @@ class _GlobalSettingsViewState extends State<GlobalSettingsView> {
|
||||||
trailing: Container(
|
trailing: Container(
|
||||||
width: MediaQuery.of(context).size.width / 4,
|
width: MediaQuery.of(context).size.width / 4,
|
||||||
child: DropdownButton(
|
child: DropdownButton(
|
||||||
|
isExpanded: true,
|
||||||
value: settings.uiColumnModeLandscape.toString(),
|
value: settings.uiColumnModeLandscape.toString(),
|
||||||
onChanged: (String? newValue) {
|
onChanged: (String? newValue) {
|
||||||
settings.uiColumnModeLandscape = Settings.uiColumnModeFromString(newValue!);
|
settings.uiColumnModeLandscape = Settings.uiColumnModeFromString(newValue!);
|
||||||
|
@ -197,6 +198,7 @@ class _GlobalSettingsViewState extends State<GlobalSettingsView> {
|
||||||
trailing: Container(
|
trailing: Container(
|
||||||
width: MediaQuery.of(context).size.width / 4,
|
width: MediaQuery.of(context).size.width / 4,
|
||||||
child: DropdownButton(
|
child: DropdownButton(
|
||||||
|
isExpanded: true,
|
||||||
value: settings.notificationContent,
|
value: settings.notificationContent,
|
||||||
onChanged: (NotificationContent? newValue) {
|
onChanged: (NotificationContent? newValue) {
|
||||||
settings.notificationContent = newValue!;
|
settings.notificationContent = newValue!;
|
||||||
|
|
|
@ -57,7 +57,7 @@ class _PeerSettingsViewState extends State<PeerSettingsView> {
|
||||||
return LayoutBuilder(builder: (BuildContext context, BoxConstraints viewportConstraints) {
|
return LayoutBuilder(builder: (BuildContext context, BoxConstraints viewportConstraints) {
|
||||||
String? acnCircuit = Provider.of<ContactInfoState>(context).acnCircuit;
|
String? acnCircuit = Provider.of<ContactInfoState>(context).acnCircuit;
|
||||||
|
|
||||||
Widget path = Text(Provider.of<ContactInfoState>(context, listen: false).status);
|
Widget path = Text(Provider.of<ContactInfoState>(context).status);
|
||||||
|
|
||||||
if (acnCircuit != null) {
|
if (acnCircuit != null) {
|
||||||
var hops = acnCircuit.split(",");
|
var hops = acnCircuit.split(",");
|
||||||
|
|
|
@ -80,6 +80,8 @@ class FileBubbleState extends State<FileBubble> {
|
||||||
var downloadActive = Provider.of<ProfileInfoState>(context).downloadActive(widget.fileKey());
|
var downloadActive = Provider.of<ProfileInfoState>(context).downloadActive(widget.fileKey());
|
||||||
var downloadGotManifest = Provider.of<ProfileInfoState>(context).downloadGotManifest(widget.fileKey());
|
var downloadGotManifest = Provider.of<ProfileInfoState>(context).downloadGotManifest(widget.fileKey());
|
||||||
|
|
||||||
|
var messageStatusWidget = MessageBubbleDecoration(ackd: metadata.ackd, errored: metadata.error, prettyDate: prettyDate, fromMe: fromMe);
|
||||||
|
|
||||||
// If the sender is not us, then we want to give them a nickname...
|
// If the sender is not us, then we want to give them a nickname...
|
||||||
var senderDisplayStr = "";
|
var senderDisplayStr = "";
|
||||||
var senderIsContact = false;
|
var senderIsContact = false;
|
||||||
|
@ -195,7 +197,7 @@ class FileBubbleState extends State<FileBubble> {
|
||||||
crossAxisAlignment: fromMe ? CrossAxisAlignment.end : CrossAxisAlignment.start,
|
crossAxisAlignment: fromMe ? CrossAxisAlignment.end : CrossAxisAlignment.start,
|
||||||
mainAxisAlignment: fromMe ? MainAxisAlignment.end : MainAxisAlignment.start,
|
mainAxisAlignment: fromMe ? MainAxisAlignment.end : MainAxisAlignment.start,
|
||||||
mainAxisSize: MainAxisSize.min,
|
mainAxisSize: MainAxisSize.min,
|
||||||
children: [wdgSender, isPreview ? Container() : wdgMessage, wdgDecorations]),
|
children: [wdgSender, isPreview ? Container() : wdgMessage, wdgDecorations, messageStatusWidget]),
|
||||||
));
|
));
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue