diff --git a/Classes/Swift/Chat/Views/MessageView.swift b/Classes/Swift/Chat/Views/MessageView.swift index 73134dbca..097ef7fe8 100644 --- a/Classes/Swift/Chat/Views/MessageView.swift +++ b/Classes/Swift/Chat/Views/MessageView.swift @@ -29,9 +29,9 @@ class MessageView: UIView, UITextViewDelegate { var action2 : (() -> Void)? = nil var action3 : (() -> Void)? = nil - let pictureButton = CallControlButton(buttonTheme:VoipTheme.nav_button("")) - let voiceRecordButton = CallControlButton(buttonTheme:VoipTheme.nav_button("vr_off")) - let sendButton = CallControlButton(buttonTheme:VoipTheme.nav_button("")) + let pictureButton = CallControlButton(buttonTheme:VoipTheme.nav_button("new_chat_attachment_default")) + let voiceRecordButton = CallControlButton(buttonTheme:VoipTheme.nav_button("new_vr_off")) + let sendButton = CallControlButton(buttonTheme:VoipTheme.nav_button("new_chat_send_default")) let emojisButton = CallControlButton(buttonTheme:VoipTheme.nav_button("emoji")) let messageTextView = UIView() let messageWithEmojiView = UIStackView() @@ -57,31 +57,23 @@ class MessageView: UIView, UITextViewDelegate { addSubview(pictureButton) pictureButton.alignParentLeft(withMargin: side_buttons_margin).matchParentHeight().done() - pictureButton.setImage(UIImage(named:"chat_attachment_default.png"), for: .normal) - pictureButton.setImage(UIImage(named:"chat_attachment_over.png"), for: .highlighted) addSubview(voiceRecordButton) - voiceRecordButton.toRightOf(pictureButton, withLeftMargin: -2).matchParentHeight().done() - voiceRecordButton.size(w: 30, h: 30).done() - voiceRecordButton.setImage(UIImage(named:"vr_off.png"), for: .normal) - voiceRecordButton.setImage(UIImage(named:"vr_on.png"), for: .selected) + voiceRecordButton.toRightOf(pictureButton, withLeftMargin: -8).matchParentHeight().done() voiceRecordButton.onClickAction = action3 addSubview(ephemeralIndicator) ephemeralIndicator.alignParentRight(withMargin: 4).alignParentTop(withMargin: 4).size(w: 9, h: 10).done() ephemeralIndicator.isHidden = true - addSubview(sendButton) sendButton.alignParentRight(withMargin: side_buttons_margin).matchParentHeight().done() - sendButton.setImage(UIImage(named:"chat_send_default.png"), for: .normal) - sendButton.setImage(UIImage(named:"chat_send_over.png"), for: .highlighted) sendButton.isEnabled = false sendButton.onClickAction = action2 addSubview(messageTextView) - messageTextView.toRightOf(voiceRecordButton, withLeftMargin: -2).toLeftOf(sendButton, withRightMargin: -8).matchParentHeight().done() - + messageTextView.toRightOf(voiceRecordButton, withLeftMargin: -8).toLeftOf(sendButton, withRightMargin: -8).matchParentHeight().done() + messageTextView.addSubview(messageWithEmojiView) messageWithEmojiView.matchParentDimmensions(insetedByDx: 10).done() messageWithEmojiView.backgroundColor = VoipTheme.backgroundWhiteBlack.get() diff --git a/Resources/images/new_chat_attachment_default.png b/Resources/images/new_chat_attachment_default.png new file mode 100644 index 000000000..bf610b0fb Binary files /dev/null and b/Resources/images/new_chat_attachment_default.png differ diff --git a/Resources/images/new_chat_send_default.png b/Resources/images/new_chat_send_default.png new file mode 100644 index 000000000..ffd84f2ea Binary files /dev/null and b/Resources/images/new_chat_send_default.png differ diff --git a/Resources/images/new_vr_off.png b/Resources/images/new_vr_off.png new file mode 100644 index 000000000..11a52d2e0 Binary files /dev/null and b/Resources/images/new_vr_off.png differ diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj index a30dbf4c2..1afd9f00e 100644 --- a/linphone.xcodeproj/project.pbxproj +++ b/linphone.xcodeproj/project.pbxproj @@ -605,7 +605,7 @@ 63E27A321C4FECD000D332AE /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 63E27A311C4FECD000D332AE /* LaunchScreen.xib */; }; 63E27A521C50EDB000D332AE /* hold.mkv in Resources */ = {isa = PBXBuildFile; fileRef = 63E27A511C50EB2700D332AE /* hold.mkv */; }; 63E59A3F1ADE70D900646FB3 /* InAppProductsManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 63E59A3E1ADE70D900646FB3 /* InAppProductsManager.m */; }; - 63E802DB1C625AEF000D5509 /* BuildFile in Resources */ = {isa = PBXBuildFile; }; + 63E802DB1C625AEF000D5509 /* (null) in Resources */ = {isa = PBXBuildFile; }; 63EC8D391D7438660066547B /* AssistantLinkView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 63EC8D3B1D7438660066547B /* AssistantLinkView.xib */; }; 63F1DF441BCE618E00EDED90 /* UIAddressTextField.m in Sources */ = {isa = PBXBuildFile; fileRef = 63F1DF431BCE618E00EDED90 /* UIAddressTextField.m */; }; 63FB30351A680E73008CA393 /* UIRoundedImageView.m in Sources */ = {isa = PBXBuildFile; fileRef = 63FB30341A680E73008CA393 /* UIRoundedImageView.m */; }; @@ -951,6 +951,9 @@ D779D39C29A76DE6007B8087 /* ChatConversationTableViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = D779D39B29A76DE6007B8087 /* ChatConversationTableViewModel.swift */; }; D779D39E29AC9E93007B8087 /* AudioPlayer.swift in Sources */ = {isa = PBXBuildFile; fileRef = D779D39D29AC9E92007B8087 /* AudioPlayer.swift */; }; D779D3A229B5E365007B8087 /* UIImageExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = D779D3A129B5E365007B8087 /* UIImageExtension.swift */; }; + D7A4C0082A3B135800EFBD1B /* new_chat_attachment_default.png in Resources */ = {isa = PBXBuildFile; fileRef = D7A4C0052A3B135800EFBD1B /* new_chat_attachment_default.png */; }; + D7A4C0092A3B135800EFBD1B /* new_vr_off.png in Resources */ = {isa = PBXBuildFile; fileRef = D7A4C0062A3B135800EFBD1B /* new_vr_off.png */; }; + D7A4C00A2A3B135800EFBD1B /* new_chat_send_default.png in Resources */ = {isa = PBXBuildFile; fileRef = D7A4C0072A3B135800EFBD1B /* new_chat_send_default.png */; }; D7A7545029507038005C9D4A /* CustomAlertController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D7A7544F29507038005C9D4A /* CustomAlertController.swift */; }; D7C6DE832948CF3100756E03 /* DropDownCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = D7C6DE812948CF3100756E03 /* DropDownCell.swift */; }; D7C6DE842948CF3100756E03 /* DropDownCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = D7C6DE822948CF3100756E03 /* DropDownCell.xib */; }; @@ -2195,6 +2198,9 @@ D779D39B29A76DE6007B8087 /* ChatConversationTableViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChatConversationTableViewModel.swift; sourceTree = ""; }; D779D39D29AC9E92007B8087 /* AudioPlayer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AudioPlayer.swift; sourceTree = ""; }; D779D3A129B5E365007B8087 /* UIImageExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UIImageExtension.swift; sourceTree = ""; }; + D7A4C0052A3B135800EFBD1B /* new_chat_attachment_default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = new_chat_attachment_default.png; sourceTree = ""; }; + D7A4C0062A3B135800EFBD1B /* new_vr_off.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = new_vr_off.png; sourceTree = ""; }; + D7A4C0072A3B135800EFBD1B /* new_chat_send_default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = new_chat_send_default.png; sourceTree = ""; }; D7A7544F29507038005C9D4A /* CustomAlertController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CustomAlertController.swift; sourceTree = ""; }; D7C6DE812948CF3100756E03 /* DropDownCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DropDownCell.swift; sourceTree = ""; }; D7C6DE822948CF3100756E03 /* DropDownCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = DropDownCell.xib; sourceTree = ""; }; @@ -2585,7 +2591,7 @@ path = LinphoneUI; sourceTree = ""; }; - 29B97314FDCFA39411CA2CEA = { + 29B97314FDCFA39411CA2CEA /* CustomTemplate */ = { isa = PBXGroup; children = ( 8C23BCB71D82AAC3005F19BB /* linphone.entitlements */, @@ -2706,6 +2712,9 @@ 633FEBE11D3CD5570014B822 /* images */ = { isa = PBXGroup; children = ( + D7A4C0052A3B135800EFBD1B /* new_chat_attachment_default.png */, + D7A4C0072A3B135800EFBD1B /* new_chat_send_default.png */, + D7A4C0062A3B135800EFBD1B /* new_vr_off.png */, D7CF13722A2E225200D92165 /* emoji.png */, C6E3E7ED291D648D00DDFC46 /* side_menu_voip_meeting_schedule@2x.png */, C6E3E7EB291D642B00DDFC46 /* side_menu_voip_meeting_schedule.png */, @@ -4066,7 +4075,7 @@ fr, hu, ); - mainGroup = 29B97314FDCFA39411CA2CEA; + mainGroup = 29B97314FDCFA39411CA2CEA /* CustomTemplate */; productRefGroup = 19C28FACFE9D520D11CA2CBB /* Products */; projectDirPath = ""; projectRoot = ""; @@ -4114,6 +4123,7 @@ 633FEE6E1D3CD5590014B822 /* footer_history_default.png in Resources */, 633FEEB21D3CD55A0014B822 /* numpad_2~ipad@2x.png in Resources */, 633FEDC61D3CD5590014B822 /* call_incoming.png in Resources */, + D7A4C00A2A3B135800EFBD1B /* new_chat_send_default.png in Resources */, 633FEF2D1D3CD55A0014B822 /* route_earpiece_selected@2x.png in Resources */, 638F1A621C2021B2004B8E02 /* DialerView~ipad.xib in Resources */, 615A2817217F280C0060F920 /* chat_list_indicator.png in Resources */, @@ -4137,7 +4147,7 @@ 633FEEE01D3CD55A0014B822 /* numpad_8_over~ipad@2x.png in Resources */, 633FEDDC1D3CD5590014B822 /* call_start_body_disabled~ipad.png in Resources */, C63F72FF285A31DA0066163B /* Roboto-Bold.ttf in Resources */, - 63E802DB1C625AEF000D5509 /* BuildFile in Resources */, + 63E802DB1C625AEF000D5509 /* (null) in Resources */, 633FEE2E1D3CD5590014B822 /* color_F.png in Resources */, 633FEDC51D3CD5590014B822 /* call_hangup_disabled@2x.png in Resources */, 633FEEDF1D3CD55A0014B822 /* numpad_8_over~ipad.png in Resources */, @@ -4331,6 +4341,7 @@ 615A280F217F1FD50060F920 /* chat_add_group.png in Resources */, 633FEEC41D3CD55A0014B822 /* numpad_5_default@2x.png in Resources */, 633FEDAC1D3CD5590014B822 /* backspace_over.png in Resources */, + D7A4C0082A3B135800EFBD1B /* new_chat_attachment_default.png in Resources */, 633FEE1B1D3CD5590014B822 /* chat_start_body_default@2x.png in Resources */, 633FEE021D3CD5590014B822 /* cancel_edit_default.png in Resources */, C63F72D7285A2F1E0066163B /* voip_numpad_1.png in Resources */, @@ -4456,6 +4467,7 @@ 615A28402180A2620060F920 /* invite_linphone@2x.png in Resources */, C61B1BF42667D202001A4E4A /* more_menu_default.png in Resources */, 633FEDF71D3CD5590014B822 /* camera_default@2x.png in Resources */, + D7A4C0092A3B135800EFBD1B /* new_vr_off.png in Resources */, C64A85522667B74100252AD2 /* ephemeral_messages_default.png in Resources */, 633FEDB31D3CD5590014B822 /* call_alt_back_default@2x.png in Resources */, C63F72F2285A2F1E0066163B /* voip_conference_mosaic.png in Resources */,