From b342974c988692256bca1e3b29c24de465739b3a Mon Sep 17 00:00:00 2001
From: LynJet <104435916+LynJet@users.noreply.github.com>
Date: Thu, 28 Jul 2022 19:18:15 +0200
Subject: [PATCH] =?UTF-8?q?Text=20zu=20Datei=20hinzuf=C3=BCgen=20Neues=20B?=
=?UTF-8?q?uttondesign=20Stapelnachrichtsmodus=20Anpassbarer=20Waitlayer?=
=?UTF-8?q?=20Eigene=20MessageBox?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ChatController/ChatControlWaitLayer.xaml | 2 +-
ChatController/ChatControlWaitLayer.xaml.cs | 34 +-
ChatController/ChatController.csproj | 17 +-
ChatController/ChatKlassen/ChatMessage.cs | 18 +-
ChatController/ChatKlassen/Contact.cs | 35 +-
ChatController/ChatMainControl.xaml | 287 ++++-----
ChatController/ChatMainControl.xaml.cs | 554 ++++++++++++------
.../Converter/BoolToVisibilityConverter.cs | 5 +
.../OwnChatNullVisibilityConverter.cs | 20 +
.../UserProfilePictureVisibilityConverter.cs | 2 +-
ChatController/Core/BindableTextBlock.cs | 2 +-
ChatController/Core/OwnChatCache.cs | 42 +-
ChatController/Data/OwnChatApi.cs | 2 +-
ChatController/HauptKlassen/Chat.cs | 322 ++++------
ChatController/HauptKlassen/Login.cs | 18 +-
ChatController/LoginControl.xaml.cs | 63 +-
ChatController/OwnChatMessageBox.xaml | 50 ++
ChatController/OwnChatMessageBox.xaml.cs | 76 +++
ChatController/Properties/Annotations1.cs | 2 +-
.../Ressourcen/paper-plane-solid.png | Bin 0 -> 671 bytes
ChatController/Ressourcen/paperclip-solid.png | Bin 0 -> 991 bytes
ChatController/Ressourcen/smile-regular.png | Bin 0 -> 913 bytes
ChatController/Ressourcen/sync-alt.png | Bin 0 -> 744 bytes
.../Ressourcen/tasks-solid-inverted.png | Bin 0 -> 567 bytes
ChatController/Ressourcen/tasks-solid.png | Bin 0 -> 820 bytes
ChatController/Ressourcen/times-solid.png | Bin 0 -> 330 bytes
...stMessage.cs => ChatMessageFileWrapper.cs} | 40 +-
.../Extensions/ObservableSortCollection.cs | 2 +-
ChatController/Utilities/FileUtils.cs | 40 +-
ChatController/Utilities/Utils.cs | 73 ++-
PrototypChat/.vs/PrototypChat/v16/.suo | Bin 282112 -> 292864 bytes
PrototypChat/App.xaml.cs | 15 +-
PrototypChat/MainWindow.xaml | 4 +-
PrototypChat/MainWindow.xaml.cs | 7 -
PrototypChat/Properties/Annotations.cs | 2 +-
35 files changed, 1079 insertions(+), 655 deletions(-)
create mode 100644 ChatController/Converter/OwnChatNullVisibilityConverter.cs
create mode 100644 ChatController/OwnChatMessageBox.xaml
create mode 100644 ChatController/OwnChatMessageBox.xaml.cs
create mode 100644 ChatController/Ressourcen/paper-plane-solid.png
create mode 100644 ChatController/Ressourcen/paperclip-solid.png
create mode 100644 ChatController/Ressourcen/smile-regular.png
create mode 100644 ChatController/Ressourcen/sync-alt.png
create mode 100644 ChatController/Ressourcen/tasks-solid-inverted.png
create mode 100644 ChatController/Ressourcen/tasks-solid.png
create mode 100644 ChatController/Ressourcen/times-solid.png
rename ChatController/Utilities/{BroadcastMessage.cs => ChatMessageFileWrapper.cs} (51%)
diff --git a/ChatController/ChatControlWaitLayer.xaml b/ChatController/ChatControlWaitLayer.xaml
index 21785d2..19e3ea8 100644
--- a/ChatController/ChatControlWaitLayer.xaml
+++ b/ChatController/ChatControlWaitLayer.xaml
@@ -61,7 +61,7 @@
-
+
diff --git a/ChatController/ChatControlWaitLayer.xaml.cs b/ChatController/ChatControlWaitLayer.xaml.cs
index a6d32d2..d09d0a6 100644
--- a/ChatController/ChatControlWaitLayer.xaml.cs
+++ b/ChatController/ChatControlWaitLayer.xaml.cs
@@ -1,10 +1,38 @@
-namespace ChatController
+using System.ComponentModel;
+using System.Runtime.CompilerServices;
+using ChatController.Annotations;
+
+namespace ChatController
{
- public partial class ChatControlWaitLayer
+ public partial class ChatControlWaitLayer : INotifyPropertyChanged
{
- public ChatControlWaitLayer()
+ private string _DialogText;
+
+ public string DialogText
+ {
+ get => _DialogText;
+ set
+ {
+ _DialogText = value;
+ OnPropertyChanged(nameof(DialogText));
+ }
+ }
+
+ public ChatControlWaitLayer(string dialogText = null)
{
InitializeComponent();
+
+ DataContext = this;
+
+ DialogText = dialogText ?? "Daten werden übertragen. Bitte warten...";
+ }
+
+ public event PropertyChangedEventHandler PropertyChanged;
+
+ [NotifyPropertyChangedInvocator]
+ protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = null)
+ {
+ PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
}
}
}
\ No newline at end of file
diff --git a/ChatController/ChatController.csproj b/ChatController/ChatController.csproj
index de91cda..eb04b1d 100644
--- a/ChatController/ChatController.csproj
+++ b/ChatController/ChatController.csproj
@@ -68,6 +68,7 @@
+
@@ -100,7 +101,10 @@
True
Resource.resx
-
+
+ OwnChatMessageBox.xaml
+
+
@@ -130,6 +134,10 @@
MSBuild:Compile
Designer
+
+ Designer
+ MSBuild:Compile
+
@@ -153,6 +161,13 @@
+
+
+
+
+
+
+
diff --git a/ChatController/ChatKlassen/ChatMessage.cs b/ChatController/ChatKlassen/ChatMessage.cs
index a9f5358..1114d7f 100644
--- a/ChatController/ChatKlassen/ChatMessage.cs
+++ b/ChatController/ChatKlassen/ChatMessage.cs
@@ -70,7 +70,7 @@ namespace ChatController.ChatKlassen
OriginalImage = originalImage;
OriginalImageName = imageName;
- if(MessageId == 0 && MessageType == ChatMessageType.Image && logo != null)
+ if(MessageId == 0 && MessageType == ChatMessageType.Image && !(logo is null))
{
PictureSource = logo;
PicturePlaceholderHeight = (int) logo.Height;
@@ -81,9 +81,7 @@ namespace ChatController.ChatKlassen
if(!string.IsNullOrWhiteSpace(thumbnailPath))
{
ThumbnailPlaceholderHeight = Utils.GetHeightFromThumbnailUri(thumbnailPath);
- Thumbnail = Utils.GetPicturePlaceholder();
-
- Utils.DownloadImageAsync(thumbnailPath, $"group-{groupId}", CacheCategory.Thumbnail, imageSource =>
+ Utils.DownloadDocumentThumbnail(thumbnailPath, imageSource =>
{
Thumbnail = imageSource;
});
@@ -208,17 +206,7 @@ namespace ChatController.ChatKlassen
public override bool Equals(object obj)
{
- if(obj is ChatMessage message)
- {
- if(message.IsSeparator && IsSeparator)
- {
- return SendTime == message.SendTime;
- }
-
- return Id.Equals(message.Id) && MessageId.Equals(message.MessageId);
- }
-
- return false;
+ return obj is ChatMessage message && (message.IsSeparator && IsSeparator ? SendTime == message.SendTime : Id.Equals(message.Id) && MessageId.Equals(message.MessageId));
}
public override string ToString()
diff --git a/ChatController/ChatKlassen/Contact.cs b/ChatController/ChatKlassen/Contact.cs
index 9ab8f2d..3c38fe9 100644
--- a/ChatController/ChatKlassen/Contact.cs
+++ b/ChatController/ChatKlassen/Contact.cs
@@ -54,14 +54,7 @@ namespace ChatController.ChatKlassen
var isOwnMessage = rmUserId.HasValue && rmUserId.Value.Equals(userId);
- if (_HasUnreadMessages && !isOwnMessage)
- {
- _Color = new BrushConverter().ConvertFromString("#ff5e00") as SolidColorBrush;
- }
- else
- {
- _Color = new SolidColorBrush(Colors.Gray);
- }
+ _Color = _HasUnreadMessages && !isOwnMessage ? new BrushConverter().ConvertFromString("#FF5A00") as SolidColorBrush : new SolidColorBrush(Colors.Gray);
OnPropertyChanged(nameof(HasUnreadMessages));
OnPropertyChanged(nameof(Color));
@@ -135,22 +128,7 @@ namespace ChatController.ChatKlassen
{
if(obj is Contact y)
{
- if(ReferenceEquals(this, y))
- {
- return true;
- }
-
- if(GetType() != y.GetType())
- {
- return false;
- }
-
- return Name == y.Name &&
- IsNewMessage == y.IsNewMessage &&
- TimeStamp.Equals(y.TimeStamp) &&
- GroupId == y.GroupId &&
- UserIdManage == y.UserIdManage &&
- IsChatMessageInputGridVisible == y.IsChatMessageInputGridVisible;
+ return GroupId == y.GroupId;
}
return false;
@@ -160,16 +138,21 @@ namespace ChatController.ChatKlassen
{
unchecked
{
- var hashCode = Name != null ? Name.GetHashCode() : 0;
+ var hashCode = Name?.GetHashCode() ?? 0;
hashCode = (hashCode * 397) ^ GroupId;
- hashCode = (hashCode * 397) ^ (UserIdManage != null ? UserIdManage.GetHashCode() : 0);
+ hashCode = (hashCode * 397) ^ (UserIdManage?.GetHashCode() ?? 0);
hashCode = (hashCode * 397) ^ IsChatMessageInputGridVisible.GetHashCode();
return hashCode;
}
}
+ public override string ToString()
+ {
+ return $"({GroupId}) {Name}";
+ }
+
public SolidColorBrush AccentColorBrush { get; }
public event PropertyChangedEventHandler PropertyChanged;
diff --git a/ChatController/ChatMainControl.xaml b/ChatController/ChatMainControl.xaml
index fcd7abb..e0245e3 100644
--- a/ChatController/ChatMainControl.xaml
+++ b/ChatController/ChatMainControl.xaml
@@ -11,15 +11,14 @@
mc:Ignorable="d"
d:DesignHeight="300" d:DesignWidth="600"
Loaded="ChatMainControl_OnLoaded"
- SnapsToDevicePixels="True" d:DataContext="{d:DesignData ChatMainControl}">
+ SnapsToDevicePixels="True" d:DataContext="{d:DesignData Type=ChatMainControl}">
+
-
-
@@ -49,84 +48,31 @@
-
+
@@ -178,6 +125,7 @@
+
@@ -186,12 +134,12 @@
+
+
+
@@ -300,7 +251,7 @@
-
+
@@ -319,19 +270,24 @@
-
+
-
+
+
+
+
-
@@ -339,19 +295,19 @@
-
+
-
-
+
@@ -366,7 +322,18 @@
-
+
+
+
+
+
+
+
+
@@ -396,7 +363,7 @@
Background="{StaticResource LightBackColor}"
ContextMenuOpening="Chat_OnContextMenuOpening"
Padding="20"
- Visibility="{Binding Path=Chat.IsInBroadcastMode, UpdateSourceTrigger=PropertyChanged, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type chatController:ChatMainControl}}, Converter={StaticResource BoolToVisibilityConverter}}"
+ Visibility="{Binding Path=ChatListBoxVisibility, UpdateSourceTrigger=PropertyChanged, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type chatController:ChatMainControl}}}"
d:DataContext="{d:DesignData ChatMessage}">
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ChatController/OwnChatMessageBox.xaml.cs b/ChatController/OwnChatMessageBox.xaml.cs
new file mode 100644
index 0000000..be83422
--- /dev/null
+++ b/ChatController/OwnChatMessageBox.xaml.cs
@@ -0,0 +1,76 @@
+using System.ComponentModel;
+using System.Runtime.CompilerServices;
+using System.Windows;
+using ChatController.Annotations;
+
+namespace ChatController
+{
+ public partial class OwnChatMessageBox : INotifyPropertyChanged
+ {
+ private string _MessageBoxText;
+
+ public string MessageBoxText
+ {
+ get => _MessageBoxText;
+ set
+ {
+ _MessageBoxText = value;
+ OnPropertyChanged(nameof(MessageBoxText));
+ }
+ }
+
+ private string _PositiveButtonText;
+ public string PositiveButtonText
+ {
+ get => _PositiveButtonText;
+ set
+ {
+ _PositiveButtonText = value;
+ OnPropertyChanged(nameof(PositiveButtonText));
+ }
+ }
+
+ private string _CloseButtonText;
+ public string CloseButtonText
+ {
+ get => _CloseButtonText;
+ set
+ {
+ _CloseButtonText = value;
+ OnPropertyChanged(nameof(CloseButtonText));
+ }
+ }
+
+ public OwnChatMessageBox(string positiveButtonText, string closeButtonText, string messageBoxText, string title)
+ {
+ InitializeComponent();
+
+ DataContext = this;
+
+ PositiveButtonText = positiveButtonText;
+ CloseButtonText = string.IsNullOrWhiteSpace(closeButtonText) ? "Schließen" : closeButtonText;
+ MessageBoxText = messageBoxText;
+ Title = title;
+ }
+
+ public event PropertyChangedEventHandler PropertyChanged;
+
+ [NotifyPropertyChangedInvocator]
+ protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = null)
+ {
+ PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+ }
+
+ private void PositiveButton_OnClick(object sender, RoutedEventArgs e)
+ {
+ DialogResult = true;
+ Close();
+ }
+
+ private void CloseButton_OnClick(object sender, RoutedEventArgs e)
+ {
+ DialogResult = false;
+ Close();
+ }
+ }
+}
diff --git a/ChatController/Properties/Annotations1.cs b/ChatController/Properties/Annotations1.cs
index 4376ea0..9b594a1 100644
--- a/ChatController/Properties/Annotations1.cs
+++ b/ChatController/Properties/Annotations1.cs
@@ -137,7 +137,7 @@ namespace ChatController.Annotations
///
///
/// void Foo(string param) {
- /// if (param == null)
+ /// if (param is null)
/// throw new ArgumentNullException("par"); // Warning: Cannot resolve symbol
/// }
///
diff --git a/ChatController/Ressourcen/paper-plane-solid.png b/ChatController/Ressourcen/paper-plane-solid.png
new file mode 100644
index 0000000000000000000000000000000000000000..a7cc99b00a65d4c0733b00d3f9a0c9c0e7e50fce
GIT binary patch
literal 671
zcmV;Q0$}}#P)+w6IV}=OaZ>NhQ9}_$JXLAB&lgak8^Bv%AT!oH@VqJ$L4wb8iUqEOg-(KBIR&
z!R_e9FEbjQFZe->n62Tt25-gVD&T1iw9FB>1N|X{!4Sf(8lgkY2Djo2zSdZEQb(Ez
zKZI8qpgXC}H?8hwfH&en26zhRupg7DcN1u91iS+M_?rPA$1!ZcXqET%bpRIPBtB+<
z;X8V;3_}?)1NFf7;&}})yu}tQz`YuAm&<_Hi8fN6UZ5-XT+4~g?*J@8AI1v6A7Xjz
zJ6<4ub1iTsPV%lmBDje~v3Ey-g0njS+wrs@n5Yw4V(%)^9>~+|4#4VoB~t~#6F8Od
zFUDX&??6ZyFXDGWGyKGX)GxbT!ha=M!2J?N_<(JxuXny=j-yHQ`x3@stWCiWn>}Xp
z)SXPw6DQ8o6LhBFoA9F~ym|*ymKt&Hzy>^_iLV*Trp?h-t;6
zI^YyN1JH&&8Sie?2`AYB^$4dMfYZn=NVHGJ8!X_zGoVtkfKMTW&fLIkO@<{98FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H118hk|
zK~z|Ut=C(KRaG3v@pVQqr&5QY$QaWytRPB>d?M2+-WcF&tZ&&MFnyfxkyzde
z_!-!l0UW?4Y{$`reiY|U1U?n-WZ=E%DCJ&=j}mz+nuSj(o-P$HVp76$k+>?#v8x&Q
zB)pt~zlOl;Z0}`vH3SX5e{#o(l?`QNih5uswp3skBVLkZrO!2P@cwa_;R-7~QurHwx;g)*v
zdo#tq6=(aq8NFLvE$8FMgg%VB>cQ`j-co-qp6aa({1vfJbmIFA{GNL7+i)sj{uP(t
zjSRdOlQ9$DWODAuby$gMDfkUInK1r=%kWaB@Y^^IXXA@Z&cj%Q!Q%TaOfSPbu|Hw_
z6PJqzh*WGY;Ai2}OwOaY-sp{JM|lA262`x=Kz=E17mr~x@L?wBNnC@&3GE=-0%qex
zMLdCPF$>2N=02QRe0FEx&tRc+2OPwrk*8mlNLW>9_a(Fs#ADd$;y#dyF7fRhNNC5g
zxcvIJCPp`-(AHM8VR61pP54HlN1U{&Idu|Cs5`Zjp~<#b_%!Wn$Mw1^7AEaiqUT<6`RBso$G*ir(0iyd{;5-
zspwbZ$Qba=;^vg=fXlM*0?=DA3}JR9X94z9@{ZtfoQE$n@Q22P7sc;P7}sZV=VGzg
zBih9d_(=x-SY3Egv_tHA)p($e?;QCK_;f??Qn8hpLN8!eCASSrr1yJRJ1%%pv|ak@
zL|j69#r=MxxI5-zon~*n;!IAR-x`e`v^51U4WiTN%R{{w7EjI-gO>&|4Npj4sjJbC
z8z;ic{$JwVeQ5~crVzrs5W>t5!r>6Yz7RrR2;t2T!nRtiHaw95{0Gkc0!wqOF4h15
N002ovPDHLkV1fud;6?xd
literal 0
HcmV?d00001
diff --git a/ChatController/Ressourcen/smile-regular.png b/ChatController/Ressourcen/smile-regular.png
new file mode 100644
index 0000000000000000000000000000000000000000..0437a2a224ab49b1f6f8811fdb5443d30a9a8b38
GIT binary patch
literal 913
zcmV;C18)3@P)uAZ2$lO8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H110G34
zK~z|Uy_d~zjX@N~pZBKK)>j(|T0#+5Hz=`@SYTs;T1bRQxGdEFAU55Q_}qy2+=#Uu
z3ldh;MyjzRDQy>2sjpUBG(U@(o1Aw#@9o=aJjt8fJLls$GiT<^oJ2VRER?iY(oRXO
zl2%D-@ZztM-bs2X>9M5yNs|1?>w7BV7T`AUll&L~ZUM!AA)X6d0Dez{IK(gD98jCZ
zlVp$=CEb&>J`fE_x-aRGq+Uq_etfB$|#QkN2W_0@mun~%IJ(vC=%^I
zlLtXqbc6~mq<8!I*&;U_c7nq|qZQsZ!rqzWJVyX^q&Mc(vS1;uaFlU0!@&|@UJjyp
zz>*Bvv0xSE3pi{BKNC4>z*S?^R)KtR?s2;|YrX_k@VC@7t`W&a@ndl!5wNa`^IEB`|P&E|JcK~lFF
z*cEEyO6Y6gL|z7<-P^=Uy5;B=aL8#un-*(uz++a
zE*XO=CKs1yKpQZ}=+)q=U}vD)9ZcxBk-1Xr1-Fc#4|5p-i-9gCV-$GfztM=i3s`LY
z)Zyww88__G6>$&9GA;&7TMt|VCL%;3CcJKa;N!B<83)#c`8yXlDk%W41-K4;iVzQa
z;w=%oV}b73*aoU4ox`zM5N2W$x~M?~;BtN`
z@YRQX31t{=j0Dl=XHuPmxEiH6|bYc%xjeSZ+)j
z0=rJR#^i(Y!taR=+P)uAZ2$lO8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H10(D75
zK~z|U?U&tak6{?cKlf&8nj*!_%ho6T#5ey;m@?&}H^gxUu50f&KJpdDBT
zv;d!hx4;YFF>o)0FkO^8Pk6I>MV+xYX4Pxz`V7uB>LInYk#LK8QT9d+WW3n4{(8}JC|C|j-^Oab44P07V22Gp&YbvsNj`WfBj>AnvciV?jbB5)0dr~adxW{MGXvO#LrX|?^NI9iL0Wvnf|J7R}}AZ>8F-!;CRaVg1Wt;fg44|
zRhxh#DLlg=gjZDz5buPd7+VI+0iP0!KY*(h#R1L&FM*XgdEbG-KhXJ)e*{5Y3mhYM
zHjOY1+zcUnt0JVHARg}K#PW62=OsSdOI5^c28L7k2AY7L5YJUas(>0+qoKGee
z#a(q*0pT9gYrcqKb=hKm&_rKWU}L}taGy8@eE=4S6H+hnX5HK1`AJ}32;tX_nPy;u
z_*2U2jH_Z2=nEmdUb1RzJ{B=3ef
literal 0
HcmV?d00001
diff --git a/ChatController/Ressourcen/tasks-solid-inverted.png b/ChatController/Ressourcen/tasks-solid-inverted.png
new file mode 100644
index 0000000000000000000000000000000000000000..433902203b5682d69251348adc17d8dfe9e23cb4
GIT binary patch
literal 567
zcmV-70?7S|P)!##Lq3+SFx!f~hQ-}By
zDeBJRJSMSSI43z=D7t3UU?L#u&1Ntn0BYt_6I
zy362ID3k2Qr`Eg(A1;Ackc7Ej;R#k3;6wA9gt^|Rn~b{4i%Gbk)ZB!9mRjMW-$!y>
zkCW-TZ&e#;{**3v2}6bZgT4wJpWD#sB+P;&In-uxU)z?>!C~{v$7ue}`y6G75JuXp
z-7D$oXc9K}z!#^j^j*j`H|Dq=r`q+TQCm7@U{U{regT2xkRp?ZUzY#?002ovPDHLk
FV1fx)1z-RG
literal 0
HcmV?d00001
diff --git a/ChatController/Ressourcen/tasks-solid.png b/ChatController/Ressourcen/tasks-solid.png
new file mode 100644
index 0000000000000000000000000000000000000000..d6498808e2a53385fb7cc5d6f293f48d08cb02d9
GIT binary patch
literal 820
zcmV-41Izr0P)EX>4Tx04R}tkv&MmKpe$iTcsi`4n`1h2w0sgh>AE$6^me@v=v%)FuC*#nlvOS
zE{=k0!NHHks)LKOt`4q(Aou~|=;Wm6A|?JWDYS_3;J6>}?mh0_0scmXsb<#%plX(p
zipRukZdDAvB8UNmF#U6f~epZjx!mAuISpGZ8%bi*RvAfDN@
zbk6(40xL-h@j3ChK^G)`flJ
z$Vo&H4dY<(r@4SDdnkYd;H5S+12SiUpfW%yspkpj
zQPQq4rg9eunSLheToRj@TP*_m&%a)E3RJ$>Q#JntD1kh=`CkW8)HJeRjQhZ=q$O~i
z`qh2l-6>@e+wc~S=p4p%zG`8_8Nv7si8Dq8@76=X^
yZ!js+&n)TkhPzwOH&IA91a52r)0ePQoB9NEiVck(=Z3HV0000L(d(p
z(UYZBxQ|Mnu)Wj7{U`E?Yrrv+Q%+Ok_WxX!E-`0!(K`mt4{TNn%#TE~lcO&)noi)k
z*j8A?YHl)rO>V=H$jdu*9?5-~e(R=K&CH|B8V;|2%sU_CwxfY*313G;dcp=11E#pf
zn~U_7ww*XSv!W``t9b3pGtM`=eqWTWkht4Weeriwy|9&r@#1X@!?R`t+1@wJkhtIY
ztFUi}Lek}?|5K-}+s`al#9do{bK(56RlHh{t`_cBllE9s$-RWj>Y#CS^w$?tKR;t;
XidCp=ww2xi^df_&tDnm{r-UW|+aZK8
literal 0
HcmV?d00001
diff --git a/ChatController/Utilities/BroadcastMessage.cs b/ChatController/Utilities/ChatMessageFileWrapper.cs
similarity index 51%
rename from ChatController/Utilities/BroadcastMessage.cs
rename to ChatController/Utilities/ChatMessageFileWrapper.cs
index 1819df3..16d5182 100644
--- a/ChatController/Utilities/BroadcastMessage.cs
+++ b/ChatController/Utilities/ChatMessageFileWrapper.cs
@@ -5,11 +5,14 @@ using System.Runtime.CompilerServices;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using ChatController.Annotations;
+using ChatController.Core;
namespace ChatController.Utilities
{
- public class BroadcastMessage : INotifyPropertyChanged
+ public class ChatMessageFileWrapper : INotifyPropertyChanged
{
+ public string FileName => !string.IsNullOrWhiteSpace(OriginalFilePath) ? Path.GetFileName(OriginalFilePath) : null;
+
private string _OriginalFilePath;
public string OriginalFilePath
{
@@ -18,6 +21,7 @@ namespace ChatController.Utilities
{
_OriginalFilePath = value;
OnPropertyChanged(nameof(OriginalFilePath));
+ OnPropertyChanged(nameof(FileName));
}
}
@@ -32,29 +36,39 @@ namespace ChatController.Utilities
}
}
- private ImageSource _BroadcastMessageImageSource;
+ private ImageSource _ChatMessageImageSource;
- public ImageSource BroadcastMessageImageSource
+ public ImageSource ChatMessageImageSource
{
- get => _BroadcastMessageImageSource;
- set
+ get => _ChatMessageImageSource;
+ private set
{
- _BroadcastMessageImageSource = value;
- OnPropertyChanged(nameof(BroadcastMessageImageSource));
+ _ChatMessageImageSource = value;
+ OnPropertyChanged(nameof(ChatMessageImageSource));
}
}
- public BroadcastMessage(string originalFilePath, string scaledFilePath)
+ public ChatMessageFileWrapper(string originalFilePath, string scaledFilePath, string thumbnailUrl)
{
OriginalFilePath = originalFilePath;
ScaledFilePath = scaledFilePath;
- var bitmap = new BitmapImage();
- bitmap.BeginInit();
- bitmap.UriSource = new Uri(scaledFilePath);
- bitmap.EndInit();
+ var uri = new Uri(scaledFilePath);
- BroadcastMessageImageSource = bitmap;
+ if (Constants.ImageFileExtensions.Contains(Path.GetExtension(scaledFilePath).ToUpperInvariant()) && uri.IsFile)
+ {
+ var bitmap = new BitmapImage(uri);
+ bitmap.Freeze();
+
+ ChatMessageImageSource = bitmap;
+ }
+ else
+ {
+ Utils.DownloadDocumentThumbnail(thumbnailUrl, imageSource =>
+ {
+ ChatMessageImageSource = imageSource;
+ });
+ }
}
public event PropertyChangedEventHandler PropertyChanged;
diff --git a/ChatController/Utilities/Extensions/ObservableSortCollection.cs b/ChatController/Utilities/Extensions/ObservableSortCollection.cs
index 2289be4..4a45afd 100644
--- a/ChatController/Utilities/Extensions/ObservableSortCollection.cs
+++ b/ChatController/Utilities/Extensions/ObservableSortCollection.cs
@@ -49,7 +49,7 @@ namespace ChatController.Utilities.Extensions
public void Sort()
{
- if (_Comparer != null)
+ if (!(_Comparer is null))
{
DisconnectHandler();
var lTemp = this.ToList();
diff --git a/ChatController/Utilities/FileUtils.cs b/ChatController/Utilities/FileUtils.cs
index 598d0cd..2216f4a 100644
--- a/ChatController/Utilities/FileUtils.cs
+++ b/ChatController/Utilities/FileUtils.cs
@@ -1,4 +1,5 @@
using System;
+using System.Diagnostics;
using System.Drawing;
using System.Drawing.Drawing2D;
using System.Drawing.Imaging;
@@ -13,6 +14,13 @@ namespace ChatController.Utilities
{
try
{
+ var isImageFile = Constants.ImageFileExtensions.Contains(Path.GetExtension(pFile).ToUpperInvariant());
+
+ if(!isImageFile)
+ {
+ return pFile;
+ }
+
byte[] mediaFile;
using(Stream reader = File.OpenRead(pFile))
{
@@ -79,7 +87,8 @@ namespace ChatController.Utilities
graphics.DrawImage(scaledBitmap, (int)width, (int)height);
}
- var filePath = Path.GetTempPath() + Guid.NewGuid() + pFormat;
+ // tmp_img_owch_
+ var filePath = $"{Path.GetTempPath()}{Guid.NewGuid()}_tmp_img_owch{pFormat}";
if(pFormat.Equals(".JPG") || pFormat.Equals(".JPE") || pFormat.Equals(".JPEG") || pFormat.Equals(".BMP"))
{
@@ -120,12 +129,37 @@ namespace ChatController.Utilities
return pFile;
}
}
-
+
public static bool CheckFileSize(string pathToFile, long maxFileSize)
{
var fileInfo = new FileInfo(pathToFile);
-
+
return fileInfo.Length > maxFileSize;
}
+
+ public static bool IsFileLocked(string path)
+ {
+ if(!File.Exists(path))
+ {
+ return false;
+ }
+
+ try
+ {
+ var file = new FileInfo(path);
+
+ using (var stream = file.Open(FileMode.Open, FileAccess.Read, FileShare.None))
+ {
+ stream.Close();
+ }
+ }
+ catch(IOException ioException)
+ {
+ Debug.WriteLine($"Error (FileUtils.IsFileLocked): {ioException.Message}");
+ return true;
+ }
+
+ return false;
+ }
}
}
diff --git a/ChatController/Utilities/Utils.cs b/ChatController/Utilities/Utils.cs
index e3ad49c..58f9efa 100644
--- a/ChatController/Utilities/Utils.cs
+++ b/ChatController/Utilities/Utils.cs
@@ -14,14 +14,11 @@ using System.Windows;
using System.Windows.Documents;
using System.Windows.Interop;
using System.Windows.Media;
-using System.Windows.Media.Animation;
using System.Windows.Media.Imaging;
using ChatController.Core;
using RestSharp;
using MessageBox = System.Windows.MessageBox;
using PixelFormat = System.Drawing.Imaging.PixelFormat;
-using Point = System.Drawing.Point;
-using Size = System.Drawing.Size;
namespace ChatController.Utilities
{
@@ -138,7 +135,7 @@ namespace ChatController.Utilities
var cachedImage = cache.GetImageSourceFromCache(key, uri, cacheCategory);
- if (cachedImage != null)
+ if(!(cachedImage is null))
{
callback?.Invoke(cachedImage);
return;
@@ -151,15 +148,38 @@ namespace ChatController.Utilities
});
}
+ public static void DownloadDocumentThumbnail(string uri, Action callback)
+ {
+ if (string.IsNullOrEmpty(uri))
+ {
+ callback?.Invoke(null);
+ return;
+ }
+
+ var cache = OwnChatCache.GetInstance();
+
+ if(!(cache.DocumentThumbnail is null))
+ {
+ callback?.Invoke(cache.DocumentThumbnail);
+ return;
+ }
+
+ DownloadImage(uri, imageSource =>
+ {
+ cache.DocumentThumbnail = imageSource;
+ callback?.Invoke(imageSource);
+ });
+ }
+
private static ImageSource GetDefaultImageSource(bool pIsGroup, bool pIsEmployee)
{
var defaultImage = Constants.EmployeeDefaultImagePath;
- if (pIsGroup)
+ if(pIsGroup)
{
defaultImage = pIsEmployee ? Constants.TeamDefaultImagePath : Constants.NormalGroupDefaultImagePath;
}
- else if (!pIsEmployee)
+ else if(!pIsEmployee)
{
defaultImage = Constants.CustomerDefaultImagePath;
}
@@ -176,21 +196,28 @@ namespace ChatController.Utilities
public static ImageSource GetPicturePlaceholder()
{
- var resultBitmapImage = new BitmapImage();
+ var cache = OwnChatCache.GetInstance();
- resultBitmapImage.BeginInit();
- resultBitmapImage.UriSource = new Uri(Constants.ImagePlaceholderPath);
- resultBitmapImage.EndInit();
- resultBitmapImage.Freeze();
+ if(cache.ImagePlaceholder is null)
+ {
+ var resultBitmapImage = new BitmapImage();
- return resultBitmapImage;
+ resultBitmapImage.BeginInit();
+ resultBitmapImage.UriSource = new Uri(Constants.ImagePlaceholderPath);
+ resultBitmapImage.EndInit();
+ resultBitmapImage.Freeze();
+
+ cache.ImagePlaceholder = resultBitmapImage;
+ }
+
+ return cache.ImagePlaceholder;
}
public static string ReadStream(WebResponse response)
{
var dataStream = response.GetResponseStream();
- if (dataStream == null)
+ if(dataStream is null)
{
return null;
}
@@ -214,21 +241,21 @@ namespace ChatController.Utilities
var localAppData = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData);
var companyFilePath = Path.Combine(localAppData, Resource.CompanyName);
- if (!Directory.Exists(companyFilePath))
+ if(!Directory.Exists(companyFilePath))
{
Directory.CreateDirectory(companyFilePath);
}
var bewoFilePath = Path.Combine(companyFilePath, Resource.ApplicationFolderName);
- if (!Directory.Exists(bewoFilePath))
+ if(!Directory.Exists(bewoFilePath))
{
Directory.CreateDirectory(bewoFilePath);
}
return bewoFilePath;
}
- catch (Exception exception)
+ catch(Exception exception)
{
MessageBox.Show("Fehler beim Anlegen des Anwendungsordners. Sie besitzen nicht die erforderlichen Rechte, bitte wenden Sie sich an Ihren Systemadministrator.\n" + exception.Message, "BeWoPlaner", MessageBoxButton.OK, MessageBoxImage.Exclamation);
}
@@ -251,15 +278,15 @@ namespace ChatController.Utilities
{
try
{
- using (var memoryStream = new MemoryStream())
+ using(var memoryStream = new MemoryStream())
{
pImage.Save(memoryStream, ImageFormat.Bmp);
return memoryStream.ToArray();
}
}
- catch (Exception e)
+ catch(Exception exception)
{
- MessageBox.Show("Fehler: " + e.Message, "Fehler", MessageBoxButton.OK);
+ MessageBox.Show("Fehler: " + exception.Message, "Fehler", MessageBoxButton.OK);
return null;
}
}
@@ -337,7 +364,7 @@ namespace ChatController.Utilities
public static byte[] ReadFully(Stream pStream)
{
- using (var memStream = new MemoryStream())
+ using(var memStream = new MemoryStream())
{
pStream.CopyTo(memStream);
return memStream.ToArray();
@@ -346,7 +373,7 @@ namespace ChatController.Utilities
public static RotateFlipType OrientationToFlipType(string orientation)
{
- switch (int.Parse(orientation))
+ switch(int.Parse(orientation))
{
case 1:
return RotateFlipType.RotateNoneFlipNone;
@@ -453,7 +480,7 @@ namespace ChatController.Utilities
https://test.ownchat.de/message/view-image/{customerid}/{group}/{height}/{filename}
*/
- if (uri != null && uri.Contains("/"))
+ if(uri?.Contains("/") ?? false)
{
var splitUri = uri.Split('/');
@@ -477,7 +504,7 @@ namespace ChatController.Utilities
{
var result = new ObservableCollection();
- if(messageText == null)
+ if(messageText is null)
{
return result;
}
diff --git a/PrototypChat/.vs/PrototypChat/v16/.suo b/PrototypChat/.vs/PrototypChat/v16/.suo
index 348990654a5c83e46e58fd2ba65555154c5ac156..02dc9bb1064afd718c5b98f19419602b414fe5a5 100644
GIT binary patch
delta 22751
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
IqPFGw-$@J10ssI2
diff --git a/PrototypChat/App.xaml.cs b/PrototypChat/App.xaml.cs
index d4ceeba..363f8d5 100644
--- a/PrototypChat/App.xaml.cs
+++ b/PrototypChat/App.xaml.cs
@@ -1,17 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.Configuration;
-using System.Data;
-using System.Linq;
-using System.Threading.Tasks;
-using System.Windows;
-
-namespace ownChat
+namespace ownChat
{
- ///
- /// Interaktionslogik für "App.xaml"
- ///
- public partial class App : Application
+ public partial class App
{
}
}
diff --git a/PrototypChat/MainWindow.xaml b/PrototypChat/MainWindow.xaml
index fa6b2df..d85b209 100644
--- a/PrototypChat/MainWindow.xaml
+++ b/PrototypChat/MainWindow.xaml
@@ -5,8 +5,8 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:cc="clr-namespace:ChatController;assembly=ChatController"
mc:Ignorable="d" WindowStartupLocation="CenterScreen" Icon="pack://application:,,,/ChatController;component/Ressourcen/ownchat_icon.png"
- SizeChanged="MainWindow_OnSizeChanged" MinHeight="610"
- Title="ownChat Desktop" Height="700" Width="900" x:Name="MainView" Closed="MainWindow_OnClosed">
+ MinHeight="610"
+ Title="ownChat Desktop" Height="700" Width="900" Closed="MainWindow_OnClosed">
diff --git a/PrototypChat/MainWindow.xaml.cs b/PrototypChat/MainWindow.xaml.cs
index fe0370c..651514b 100644
--- a/PrototypChat/MainWindow.xaml.cs
+++ b/PrototypChat/MainWindow.xaml.cs
@@ -1,5 +1,4 @@
using System;
-using System.Diagnostics;
using System.Threading;
using System.Windows;
@@ -21,7 +20,6 @@ namespace ownChat
ChatMainControl.ContainingWindow = this;
ChatMainControl.InitMitChatdaten(x);
- ChatMainControl.ResetStyle();
_EmojiView = new ChatEmojisView(ChatMainControl);
}
@@ -50,10 +48,5 @@ namespace ownChat
Environment.Exit(0);
}
-
- private void MainWindow_OnSizeChanged(object sender, SizeChangedEventArgs e)
- {
- Debug.WriteLine($"+++>ActualHeight: {ActualHeight}");
- }
}
}
diff --git a/PrototypChat/Properties/Annotations.cs b/PrototypChat/Properties/Annotations.cs
index 49365e2..33ee2e6 100644
--- a/PrototypChat/Properties/Annotations.cs
+++ b/PrototypChat/Properties/Annotations.cs
@@ -137,7 +137,7 @@ namespace ownChat.Annotations
///
///
/// void Foo(string param) {
- /// if (param == null)
+ /// if (param is null)
/// throw new ArgumentNullException("par"); // Warning: Cannot resolve symbol
/// }
///