Skip to content

Commit 0edc489

Browse files
watfordjcwatfordjc
committed
Make TweetPanel variables and properties generic
1 parent 9cba6e9 commit 0edc489

File tree

2 files changed

+141
-141
lines changed

2 files changed

+141
-141
lines changed

‎MessageToImage/MainWindow.xaml.cs

Lines changed: 56 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -146,13 +146,13 @@ private TweetPanel CreateVerticalTweetPanel()
146146

147147
#region Set filenames and image sizes for resources
148148
verticalTweetPanel.SetImage(
149-
CanvasElement.TWITTER_LOGO,
149+
CanvasElement.NETWORK_LOGO,
150150
@"C:/Users/John/Pictures/Twitch/Twitter_Logo_Blue.png",
151151
240.0f,
152152
240.0f
153153
);
154154
verticalTweetPanel.SetImage(
155-
CanvasElement.RETWEET_LOGO,
155+
CanvasElement.SHARE_LOGO,
156156
@"C:/Users/John/Pictures/Twitch/Twitter_Retweet.png",
157157
240.0f - 100.0f,
158158
240.0f - 100.0f
@@ -200,21 +200,21 @@ private TweetPanel CreateVerticalTweetPanel()
200200
verticalTweetPanel.SetFont(CanvasElement.TIME, new Interop.FontSettings()
201201
{
202202
FontName = "Noto Sans",
203-
FontSize = verticalTweetPanel.TwitterLogoRectangle.Bottom / 3,
203+
FontSize = verticalTweetPanel.NetworkLogoRectangle.Bottom / 3,
204204
FontWeight = 700,
205205
LocaleName = "en-GB"
206206
});
207-
verticalTweetPanel.SetFont(CanvasElement.RETWEETER_DISPLAY_NAME, new Interop.FontSettings()
207+
verticalTweetPanel.SetFont(CanvasElement.SHARER_DISPLAY_NAME, new Interop.FontSettings()
208208
{
209209
FontName = "Noto Sans",
210-
FontSize = verticalTweetPanel.TwitterLogoRectangle.Bottom / 3,
210+
FontSize = verticalTweetPanel.NetworkLogoRectangle.Bottom / 3,
211211
FontWeight = 700,
212212
LocaleName = "en-GB"
213213
});
214-
verticalTweetPanel.SetFont(CanvasElement.RETWEETER_USERNAME, new Interop.FontSettings()
214+
verticalTweetPanel.SetFont(CanvasElement.SHARER_USERNAME, new Interop.FontSettings()
215215
{
216216
FontName = "Noto Sans",
217-
FontSize = verticalTweetPanel.TwitterLogoRectangle.Bottom / 3,
217+
FontSize = verticalTweetPanel.NetworkLogoRectangle.Bottom / 3,
218218
FontWeight = 500,
219219
LocaleName = "en-GB"
220220
});
@@ -283,25 +283,25 @@ private TweetPanel CreateVerticalTweetPanel()
283283
#endregion
284284

285285
#region Set Tweet area relative to canvas
286-
verticalTweetPanel.TweetOriginPoint = new Interop.PointF()
286+
verticalTweetPanel.MessageOriginPoint = new Interop.PointF()
287287
{
288288
X = 60.0f,
289289
Y = verticalTweetPanel.HeadingSeparatorRectangle.Bottom + 90.0f
290290
};
291-
verticalTweetPanel.TweetRectangle = new Interop.RectF()
291+
verticalTweetPanel.MessageRectangle = new Interop.RectF()
292292
{
293293
Left = 0,
294294
Top = 0,
295-
Right = verticalTweetPanel.PanelRectangle.Width - (verticalTweetPanel.TweetOriginPoint.X * 2),
296-
Bottom = verticalTweetPanel.PanelRectangle.Height - verticalTweetPanel.TweetOriginPoint.Y - 60.0f
295+
Right = verticalTweetPanel.PanelRectangle.Width - (verticalTweetPanel.MessageOriginPoint.X * 2),
296+
Bottom = verticalTweetPanel.PanelRectangle.Height - verticalTweetPanel.MessageOriginPoint.Y - 60.0f
297297
};
298298
#endregion
299299

300300
#region Set Tweet profile image area relative to canvas
301301
verticalTweetPanel.ProfileImageOriginPoint = new Interop.PointF()
302302
{
303-
X = verticalTweetPanel.TweetOriginPoint.X,
304-
Y = verticalTweetPanel.TweetOriginPoint.Y
303+
X = verticalTweetPanel.MessageOriginPoint.X,
304+
Y = verticalTweetPanel.MessageOriginPoint.Y
305305
};
306306
verticalTweetPanel.ProfileImageRectangle = new Interop.RectF()
307307
{
@@ -327,7 +327,7 @@ private TweetPanel CreateVerticalTweetPanel()
327327

328328
private string DrawVerticalTweet(TweetPanel verticalTweetPanel, string profileImageFilename, string displayName, string username, string text, string time, string retweeterDisplayName = null, string retweeterUsername = null)
329329
{
330-
verticalTweetPanel.ClearArea(verticalTweetPanel.TweetOriginPoint, verticalTweetPanel.TweetRectangle, brushes["backgroundBrush"], true, true);
330+
verticalTweetPanel.ClearArea(verticalTweetPanel.MessageOriginPoint, verticalTweetPanel.MessageRectangle, brushes["backgroundBrush"], true, true);
331331

332332
#region Profile image
333333
// TODO: Set ProfileImageFilename
@@ -355,7 +355,7 @@ private string DrawVerticalTweet(TweetPanel verticalTweetPanel, string profileIm
355355
{
356356
Left = 0.0f,
357357
Top = 0.0f,
358-
Right = verticalTweetPanel.TweetRectangle.Right - verticalTweetPanel.ProfileImageRectangle.Right - verticalTweetPanel.ProfileImageOriginPoint.X,
358+
Right = verticalTweetPanel.MessageRectangle.Right - verticalTweetPanel.ProfileImageRectangle.Right - verticalTweetPanel.ProfileImageOriginPoint.X,
359359
Bottom = verticalTweetPanel.ProfileImageRectangle.Bottom / 2
360360
});
361361
verticalTweetPanel.DrawTextLayout(CanvasElement.SUBHEADER, brushes["textBrush"]);
@@ -366,7 +366,7 @@ private string DrawVerticalTweet(TweetPanel verticalTweetPanel, string profileIm
366366
{
367367
Left = 0.0f,
368368
Top = 0.0f,
369-
Right = verticalTweetPanel.TweetRectangle.Right - verticalTweetPanel.ProfileImageRectangle.Right - verticalTweetPanel.ProfileImageOriginPoint.X,
369+
Right = verticalTweetPanel.MessageRectangle.Right - verticalTweetPanel.ProfileImageRectangle.Right - verticalTweetPanel.ProfileImageOriginPoint.X,
370370
Bottom = verticalTweetPanel.ProfileImageRectangle.Bottom / 2
371371
});
372372

@@ -376,7 +376,7 @@ private string DrawVerticalTweet(TweetPanel verticalTweetPanel, string profileIm
376376
verticalTweetPanel.UsernameOriginPoint = new Interop.PointF()
377377
{
378378
X = verticalTweetPanel.DisplayNameOriginPoint.X,
379-
Y = verticalTweetPanel.TweetOriginPoint.Y + (verticalTweetPanel.ProfileImageRectangle.Bottom / 2)
379+
Y = verticalTweetPanel.MessageOriginPoint.Y + (verticalTweetPanel.ProfileImageRectangle.Bottom / 2)
380380
};
381381
}
382382
else
@@ -393,49 +393,49 @@ private string DrawVerticalTweet(TweetPanel verticalTweetPanel, string profileIm
393393

394394
#region Tweet text
395395
// TODO: Get TweetText and set TweetTextRectangle
396-
verticalTweetPanel.TweetText = text;
396+
verticalTweetPanel.MessageText = text;
397397
verticalTweetPanel.CreateTextLayout(CanvasElement.TEXT, new Interop.RectF()
398398
{
399399
Left = 0.0f,
400400
Top = 0.0f,
401-
Right = verticalTweetPanel.TweetRectangle.Right,
402-
Bottom = verticalTweetPanel.TweetRectangle.Bottom - verticalTweetPanel.UsernameRectangle.Bottom
401+
Right = verticalTweetPanel.MessageRectangle.Right,
402+
Bottom = verticalTweetPanel.MessageRectangle.Bottom - verticalTweetPanel.UsernameRectangle.Bottom
403403
});
404404
// TODO: Calculate and set TweetTextOriginPoint
405-
verticalTweetPanel.TweetTextOriginPoint = new Interop.PointF()
405+
verticalTweetPanel.MessageTextOriginPoint = new Interop.PointF()
406406
{
407-
X = verticalTweetPanel.TweetOriginPoint.X,
407+
X = verticalTweetPanel.MessageOriginPoint.X,
408408
Y = verticalTweetPanel.ProfileImageOriginPoint.Y + Math.Max(verticalTweetPanel.ProfileImageRectangle.Bottom, verticalTweetPanel.DisplayNameRectangle.Bottom + verticalTweetPanel.UsernameRectangle.Bottom) + 90.0f
409409
};
410410
verticalTweetPanel.DrawTextLayout(CanvasElement.TEXT, brushes["textBrush"]);
411411
#endregion
412412

413413
#region Twitter logo and time
414414
// TODO: Calculate and set TwitterLogoOriginPoint
415-
verticalTweetPanel.TwitterLogoOriginPoint = new Interop.PointF()
415+
verticalTweetPanel.NetworkLogoOriginPoint = new Interop.PointF()
416416
{
417-
X = verticalTweetPanel.TweetOriginPoint.X,
418-
Y = verticalTweetPanel.TweetTextOriginPoint.Y + verticalTweetPanel.TweetTextRectangle.Bottom + 60.0f
417+
X = verticalTweetPanel.MessageOriginPoint.X,
418+
Y = verticalTweetPanel.MessageTextOriginPoint.Y + verticalTweetPanel.MessageTextRectangle.Bottom + 60.0f
419419
};
420-
verticalTweetPanel.DrawImage(CanvasElement.TWITTER_LOGO);
420+
verticalTweetPanel.DrawImage(CanvasElement.NETWORK_LOGO);
421421

422422
// TODO: Get TweetTime and set TweetTimeRectangle
423-
verticalTweetPanel.TweetTime = time;
423+
verticalTweetPanel.Time = time;
424424
verticalTweetPanel.CreateTextLayout(CanvasElement.TIME, new Interop.RectF()
425425
{
426426
Left = 0.0f,
427427
Top = 0.0f,
428-
Right = verticalTweetPanel.TweetRectangle.Right - verticalTweetPanel.TwitterLogoRectangle.Right,
429-
Bottom = verticalTweetPanel.TwitterLogoRectangle.Bottom
428+
Right = verticalTweetPanel.MessageRectangle.Right - verticalTweetPanel.NetworkLogoRectangle.Right,
429+
Bottom = verticalTweetPanel.NetworkLogoRectangle.Bottom
430430
});
431431

432432
// TODO: Calculate and set TweetTimeOriginPoint
433-
verticalTweetPanel.TweetTimeOriginPoint = new Interop.PointF()
433+
verticalTweetPanel.TimeOriginPoint = new Interop.PointF()
434434
{
435-
X = verticalTweetPanel.TweetOriginPoint.X + verticalTweetPanel.TwitterLogoRectangle.Right,
436-
Y = verticalTweetPanel.TweetTimeRectangle.Bottom < verticalTweetPanel.TwitterLogoRectangle.Bottom
437-
? verticalTweetPanel.TwitterLogoOriginPoint.Y + ((verticalTweetPanel.TwitterLogoRectangle.Bottom - verticalTweetPanel.TweetTimeRectangle.Bottom) / 2)
438-
: verticalTweetPanel.TwitterLogoOriginPoint.Y
435+
X = verticalTweetPanel.MessageOriginPoint.X + verticalTweetPanel.NetworkLogoRectangle.Right,
436+
Y = verticalTweetPanel.TimeRectangle.Bottom < verticalTweetPanel.NetworkLogoRectangle.Bottom
437+
? verticalTweetPanel.NetworkLogoOriginPoint.Y + ((verticalTweetPanel.NetworkLogoRectangle.Bottom - verticalTweetPanel.TimeRectangle.Bottom) / 2)
438+
: verticalTweetPanel.NetworkLogoOriginPoint.Y
439439
};
440440
verticalTweetPanel.DrawTextLayout(CanvasElement.TIME, brushes["textBrush"]);
441441
#endregion
@@ -444,48 +444,48 @@ private string DrawVerticalTweet(TweetPanel verticalTweetPanel, string profileIm
444444
if (retweeterDisplayName != null && retweeterUsername != null)
445445
{
446446
// TODO: Calculate and set RetweetLogoOriginPoint
447-
verticalTweetPanel.RetweetLogoOriginPoint = new Interop.PointF()
447+
verticalTweetPanel.ShareLogoOriginPoint = new Interop.PointF()
448448
{
449-
X = verticalTweetPanel.TweetOriginPoint.X + 50.0f,
450-
Y = verticalTweetPanel.TwitterLogoOriginPoint.Y + Math.Max(verticalTweetPanel.TwitterLogoRectangle.Bottom, verticalTweetPanel.TweetTimeRectangle.Bottom) + 50.0f
449+
X = verticalTweetPanel.MessageOriginPoint.X + 50.0f,
450+
Y = verticalTweetPanel.NetworkLogoOriginPoint.Y + Math.Max(verticalTweetPanel.NetworkLogoRectangle.Bottom, verticalTweetPanel.TimeRectangle.Bottom) + 50.0f
451451
};
452-
verticalTweetPanel.DrawImage(CanvasElement.RETWEET_LOGO);
452+
verticalTweetPanel.DrawImage(CanvasElement.SHARE_LOGO);
453453

454454
// TODO: Get RetweeterDisplayName and set RetweeterDisplayNameRectangle
455-
verticalTweetPanel.RetweeterDisplayName = retweeterDisplayName;
456-
verticalTweetPanel.CreateTextLayout(CanvasElement.RETWEETER_DISPLAY_NAME, new Interop.RectF()
455+
verticalTweetPanel.SharerDisplayName = retweeterDisplayName;
456+
verticalTweetPanel.CreateTextLayout(CanvasElement.SHARER_DISPLAY_NAME, new Interop.RectF()
457457
{
458458
Left = 0.0f,
459459
Top = 0.0f,
460-
Right = verticalTweetPanel.TweetRectangle.Right - verticalTweetPanel.RetweetLogoRectangle.Right - 100.0f,
461-
Bottom = verticalTweetPanel.RetweetLogoRectangle.Bottom
460+
Right = verticalTweetPanel.MessageRectangle.Right - verticalTweetPanel.ShareLogoRectangle.Right - 100.0f,
461+
Bottom = verticalTweetPanel.ShareLogoRectangle.Bottom
462462
});
463463
// TODO: Calculate and set RetweeterDisplayNameOriginPoint
464-
verticalTweetPanel.RetweeterDisplayNameOriginPoint = new Interop.PointF()
464+
verticalTweetPanel.SharerDisplayNameOriginPoint = new Interop.PointF()
465465
{
466-
X = verticalTweetPanel.TweetOriginPoint.X + verticalTweetPanel.RetweetLogoRectangle.Right + 100.0f,
467-
Y = verticalTweetPanel.RetweeterDisplayNameRectangle.Bottom < verticalTweetPanel.RetweetLogoRectangle.Bottom
468-
? verticalTweetPanel.RetweetLogoOriginPoint.Y + ((verticalTweetPanel.RetweetLogoRectangle.Bottom - verticalTweetPanel.RetweeterDisplayNameRectangle.Bottom) / 2)
469-
: verticalTweetPanel.RetweetLogoOriginPoint.Y
466+
X = verticalTweetPanel.MessageOriginPoint.X + verticalTweetPanel.ShareLogoRectangle.Right + 100.0f,
467+
Y = verticalTweetPanel.SharerDisplayNameRectangle.Bottom < verticalTweetPanel.ShareLogoRectangle.Bottom
468+
? verticalTweetPanel.ShareLogoOriginPoint.Y + ((verticalTweetPanel.ShareLogoRectangle.Bottom - verticalTweetPanel.SharerDisplayNameRectangle.Bottom) / 2)
469+
: verticalTweetPanel.ShareLogoOriginPoint.Y
470470
};
471471

472472
// TODO: Get RetweeterUsername and set RetweeterUsernameRectangle
473-
verticalTweetPanel.RetweeterUsername = $"({retweeterUsername})";
474-
verticalTweetPanel.CreateTextLayout(CanvasElement.RETWEETER_USERNAME, new Interop.RectF()
473+
verticalTweetPanel.SharerUsername = $"({retweeterUsername})";
474+
verticalTweetPanel.CreateTextLayout(CanvasElement.SHARER_USERNAME, new Interop.RectF()
475475
{
476476
Left = 0.0f,
477477
Top = 0.0f,
478-
Right = verticalTweetPanel.TweetRectangle.Right - verticalTweetPanel.RetweetLogoRectangle.Right,
479-
Bottom = verticalTweetPanel.RetweetLogoRectangle.Bottom
478+
Right = verticalTweetPanel.MessageRectangle.Right - verticalTweetPanel.ShareLogoRectangle.Right,
479+
Bottom = verticalTweetPanel.ShareLogoRectangle.Bottom
480480
});
481481
// TODO: Calculate and set RetweeterUsernameOriginPoint
482-
verticalTweetPanel.RetweeterUsernameOriginPoint = new Interop.PointF()
482+
verticalTweetPanel.SharerUsernameOriginPoint = new Interop.PointF()
483483
{
484-
X = verticalTweetPanel.RetweeterDisplayNameOriginPoint.X,
485-
Y = verticalTweetPanel.RetweetLogoOriginPoint.Y + Math.Max(verticalTweetPanel.RetweetLogoRectangle.Bottom, verticalTweetPanel.RetweeterDisplayNameRectangle.Bottom)
484+
X = verticalTweetPanel.SharerDisplayNameOriginPoint.X,
485+
Y = verticalTweetPanel.ShareLogoOriginPoint.Y + Math.Max(verticalTweetPanel.ShareLogoRectangle.Bottom, verticalTweetPanel.SharerDisplayNameRectangle.Bottom)
486486
};
487-
verticalTweetPanel.DrawTextLayout(CanvasElement.RETWEETER_DISPLAY_NAME, brushes["textBrush"]);
488-
verticalTweetPanel.DrawTextLayout(CanvasElement.RETWEETER_USERNAME, brushes["textBrush"]);
487+
verticalTweetPanel.DrawTextLayout(CanvasElement.SHARER_DISPLAY_NAME, brushes["textBrush"]);
488+
verticalTweetPanel.DrawTextLayout(CanvasElement.SHARER_USERNAME, brushes["textBrush"]);
489489
}
490490
#endregion
491491

0 commit comments

Comments
 (0)