Merge pull request 'Using build context instead of inherited context when building file bubble popout' (#395) from file_bubble_pop_fix into trunk
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/push Build is passing
Details
Reviewed-on: #395
This commit is contained in:
commit
3c71bb8184
|
@ -153,7 +153,6 @@ class CwtchNotifier {
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case "NewMessageFromPeer":
|
case "NewMessageFromPeer":
|
||||||
|
|
||||||
var identifier = int.parse(data["ConversationID"]);
|
var identifier = int.parse(data["ConversationID"]);
|
||||||
var messageID = int.parse(data["Index"]);
|
var messageID = int.parse(data["Index"]);
|
||||||
var timestamp = DateTime.tryParse(data['TimestampReceived'])!;
|
var timestamp = DateTime.tryParse(data['TimestampReceived'])!;
|
||||||
|
|
|
@ -356,7 +356,7 @@ class FileBubbleState extends State<FileBubble> {
|
||||||
void pop(context, File myFile, Widget meta) async {
|
void pop(context, File myFile, Widget meta) async {
|
||||||
await showDialog(
|
await showDialog(
|
||||||
context: context,
|
context: context,
|
||||||
builder: (_) => Dialog(
|
builder: (bcontext) => Dialog(
|
||||||
alignment: Alignment.center,
|
alignment: Alignment.center,
|
||||||
child: Container(
|
child: Container(
|
||||||
padding: EdgeInsets.all(10),
|
padding: EdgeInsets.all(10),
|
||||||
|
@ -365,16 +365,16 @@ class FileBubbleState extends State<FileBubble> {
|
||||||
title: meta,
|
title: meta,
|
||||||
trailing: IconButton(
|
trailing: IconButton(
|
||||||
icon: Icon(Icons.close),
|
icon: Icon(Icons.close),
|
||||||
color: Provider.of<Settings>(context, listen: false).theme.toolbarIconColor,
|
color: Provider.of<Settings>(bcontext, listen: false).theme.toolbarIconColor,
|
||||||
iconSize: 32,
|
iconSize: 32,
|
||||||
onPressed: () {
|
onPressed: () {
|
||||||
Navigator.pop(context, true);
|
Navigator.pop(bcontext, true);
|
||||||
})),
|
})),
|
||||||
Image.file(
|
Image.file(
|
||||||
myFile,
|
myFile,
|
||||||
cacheWidth: (MediaQuery.of(context).size.width * 0.6).floor(),
|
cacheWidth: (MediaQuery.of(bcontext).size.width * 0.6).floor(),
|
||||||
width: (MediaQuery.of(context).size.width * 0.6),
|
width: (MediaQuery.of(bcontext).size.width * 0.6),
|
||||||
height: (MediaQuery.of(context).size.height * 0.6),
|
height: (MediaQuery.of(bcontext).size.height * 0.6),
|
||||||
fit: BoxFit.scaleDown,
|
fit: BoxFit.scaleDown,
|
||||||
),
|
),
|
||||||
SizedBox(
|
SizedBox(
|
||||||
|
|
Loading…
Reference in New Issue