Commit Graph

12076 Commits

Author SHA1 Message Date
David Langley 18a8d6b3ff Merge pull request #4670 from vector-im/langleyd/4669_room_notification_settings_swiftui 2021-08-18 17:51:39 +01:00
Doug 89592e754d Merge pull request #4727 from vector-im/doug/4726_update_fastfile
Use AppVersion.xcconfig in Fastfile.
2021-08-18 15:57:15 +01:00
Doug 938b6014b5 Use AppVersion.xcconfig in Fastfile. 2021-08-18 15:26:38 +01:00
David Langley 8890073a70 Fix problem showing error message on completion 2021-08-18 15:12:12 +01:00
Doug 012eb9f767 Merge pull request #4662 from vector-im/doug/4132_improve_notification_content
Improve notification content
2021-08-18 13:05:45 +01:00
Stefan Ceriu 108f952680 Fixes #4714 - Flickering voice message cells while being sent. 2021-08-18 14:58:32 +03:00
David Langley 2aae3c6ea1 Merge branch 'langleyd/4669_room_notification_settings_swiftui' of https://github.com/vector-im/element-ios into langleyd/4669_room_notification_settings_swiftui 2021-08-18 12:48:50 +01:00
David Langley ef14d050e8 indentation 2021-08-18 12:48:04 +01:00
David Langley d42ad307a4 Update Riot/Modules/Common/SwiftUI/Inject.swift
Co-authored-by: Doug <6060466+pixlwave@users.noreply.github.com>
2021-08-18 12:46:41 +01:00
David Langley ba0856e14d Fix imports and move logic to AvatarViewModel 2021-08-18 12:45:13 +01:00
Doug 3329c169e0 Update from feedback.
Set notificationBodyLocalizationKey in CommonConfiguration. Remove redundant customisation. Use MXRoomMemberEventContent.
2021-08-18 12:32:32 +01:00
David Langley cc9b9202c3 Update Riot/Modules/Common/SwiftUI/DependencyContainerKey.swift
Co-authored-by: manuroe <manuroe@users.noreply.github.com>
2021-08-18 09:23:18 +01:00
David Langley c32002013a Update Riot/Modules/Common/SwiftUI/DependencyContainerKey.swift
Co-authored-by: manuroe <manuroe@users.noreply.github.com>
2021-08-18 09:23:00 +01:00
David Langley 8f43cf6d8c Update Riot/Modules/Common/SwiftUI/Inject.swift
Co-authored-by: manuroe <manuroe@users.noreply.github.com>
2021-08-18 09:22:44 +01:00
Doug f3ca6b2253 Add a few extra comments. 2021-08-17 15:55:35 +01:00
Doug 2de87e775c Add reaction content to notifications when available. 2021-08-17 15:51:18 +01:00
Doug 2cf5c13175 Update strings from feedback. 2021-08-17 15:38:01 +01:00
Doug 7b5267c207 Merge branch 'develop' into doug/4132_improve_notification_content 2021-08-17 14:36:40 +01:00
David Langley 1cd7bda6fa Fix tests and try fix build error 2021-08-17 14:17:18 +01:00
David Langley 4bb5c94dff Move SwiftUI version of ViewModel to a subclass 2021-08-17 13:19:27 +01:00
David Langley 40cfdf896a Fix Comment 2021-08-17 11:58:20 +01:00
David Langley ccffb34418 Remove log 2021-08-17 11:56:16 +01:00
David Langley 3fb7dc2c69 Add activity indicator 2021-08-17 11:44:08 +01:00
David Langley b0d41760ec Add dependency management, AvatarViewModel and placeholder rendering now in AvatarImage. 2021-08-17 10:19:41 +01:00
David Langley a1dd1cbcad Merge branch 'develop' of github.com:vector-im/element-ios into langleyd/4669_room_notification_settings_swiftui 2021-08-16 13:00:41 +01:00
SBiOSoftWhare 7eb09630ce Merge pull request #4716 from vector-im/steve/4715_move_app_version
Move app version from AppIdentifiers.xcconfig into a dedicated config file
2021-08-16 12:35:34 +02:00
SBiOSoftWhare a75a6253e1 Add changes 2021-08-16 11:38:18 +02:00
SBiOSoftWhare 64f3d7ba08 Alpha variant: Remove app version from AppIdentifiers.xcconfig. 2021-08-16 11:35:56 +02:00
SBiOSoftWhare 16cd74717c Include AppVersion.xcconfig in all Common.xcconfig. 2021-08-16 11:35:09 +02:00
SBiOSoftWhare 3f51a49831 Move app version from AppIdentifiers.xcconfig to AppVersion.xccconfig. 2021-08-16 11:34:15 +02:00
David Langley c68e901de6 Do avatar placeholder in SwiftUI, Add AvatarViewModel, Add dependency injection for MxMediaManager dependency. 2021-08-15 00:36:15 +01:00
SBiOSoftWhare f037ea2402 Merge pull request #4635 from vector-im/steve/4634_alpha_release
Build tools: Support building Ad Hoc alpha release
2021-08-13 18:24:31 +02:00
SBiOSoftWhare 2a36d26a92 GH actions: Update release alpha GH action with Git branch en var. 2021-08-13 17:33:22 +02:00
SBiOSoftWhare 7a7646d33e GH actions: Update release alpha GH action CocoaPods management. 2021-08-13 17:18:48 +02:00
Stefan Ceriu ea40f04b09 Fixes #1482 - Popping the user back to the home screen after leaving a room. 2021-08-13 17:57:50 +03:00
SBiOSoftWhare cb6af4604c GH actions: Remove commented code. 2021-08-13 15:57:09 +02:00
SBiOSoftWhare 7559afb384 GH actions: Update release alpha GH action PR message. 2021-08-13 15:55:35 +02:00
SBiOSoftWhare 7d1af5ae1a Merge branch 'develop' into steve/4634_alpha_release 2021-08-13 15:25:59 +02:00
SBiOSoftWhare 59fb907f43 Update fastlane 2021-08-13 14:57:24 +02:00
SBiOSoftWhare fbe2307d4c GH actions: Update release alpha GH action PR message. 2021-08-13 14:48:44 +02:00
SBiOSoftWhare 6fb336bd6a GH actions: Update release alpha GH action PR message. 2021-08-13 14:39:59 +02:00
ismailgulek e80d9f54e8 Merge pull request #4511 from vector-im/element_4471
`MXSessionState`: Use Swifty Versions
2021-08-13 14:21:52 +03:00
SBiOSoftWhare 7cda7babbb Add changelog 2021-08-13 12:27:59 +02:00
SBiOSoftWhare d419d3becb Merge branch 'develop' into steve/4634_alpha_release
# Conflicts:
#	CHANGES.md
2021-08-13 12:14:08 +02:00
SBiOSoftWhare 3bf157b96e GH actions: Update release alpha GH action with QR code link. 2021-08-13 11:52:47 +02:00
David Langley 1c1122da98 Merge branch 'langleyd/4669_room_notification_settings_swiftui' of github.com:vector-im/element-ios into langleyd/4669_room_notification_settings_swiftui 2021-08-13 10:01:11 +01:00
ismailgulek 4480efa9bd Merge branch 'develop' into element_4471 2021-08-13 11:52:12 +03:00
SBiOSoftWhare 9e97187fb6 Alpha release: Implement GH action
* GH actions: Disable existing GH actions temporary.

* GH actions: Add release alpha GH action.

* GH actions: Disable existing GH actions temporary.

* GH actions: Update release alpha GH action.

* GH actions: Update release alpha GH action.

* GH actions: Update release alpha GH action.

* GH actions: Update release alpha GH action.

* GH actions: Update release alpha GH action.

* GH actions: Update release alpha GH action.

* GH actions: Update release alpha GH action.

* GH actions: Update release alpha GH action.

* GH actions: Update release alpha GH action.

* GH actions: Update release alpha GH action.

* GH actions: Update release alpha GH action.

* GH actions: Update release alpha GH action.

* GH actions: Update release alpha GH action.

* GH actions: Update release alpha GH action.

* GH actions: Update release alpha GH action.

* GH actions: Update release alpha GH action.

* GH actions: Update release alpha GH action.

* GH actions: Update release alpha GH action.GH actions: Update release alpha GH action.

* Fastlane: Add upload to Diawi lane and write file link into GitHub env.

* GH actions: Update release alpha GH action.

* GH actions: Enable again existing GH actions.

* GH actions: Enable again existing GH actions.

* GH actions: Update release alpha GH action.

* GH actions: Update release alpha GH action.
2021-08-13 09:25:32 +02:00
David Langley 90ec1db965 Update Riot/Modules/Common/Avatar/AvatarService.swift
Co-authored-by: manuroe <manuroe@users.noreply.github.com>
2021-08-13 08:24:42 +01:00
David Langley 89ac65b39c Update Riot/Modules/Common/Avatar/AvatarService.swift
Co-authored-by: manuroe <manuroe@users.noreply.github.com>
2021-08-13 08:24:26 +01:00