Skip to content

Commit 30ff8a6

Browse files
committed
/issues/5114 - Poll creation screen
- added input toolbar poll creation action. - reordered input toolbar actions as per designs. - added multiline text field and extracted common components.
1 parent b7d25cb commit 30ff8a6

File tree

50 files changed

+1231
-42
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+1231
-42
lines changed

Config/BuildSettings.swift

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -288,6 +288,13 @@ final class BuildSettings: NSObject {
288288
static let roomScreenAllowMediaLibraryAction: Bool = true
289289
static let roomScreenAllowStickerAction: Bool = true
290290
static let roomScreenAllowFilesAction: Bool = true
291+
static var roomScreenAllowPollsAction: Bool {
292+
guard #available(iOS 14, *) else {
293+
return false
294+
}
295+
296+
return false
297+
}
291298

292299
/// Allow split view detail view stacking
293300
static let allowSplitViewDetailsScreenStacking: Bool = true

DesignKit/Source/FontsSwiftUI.swift

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@ import SwiftUI
2222
*/
2323
@available(iOS 14.0, *)
2424
public struct FontSwiftUI: Fonts {
25+
26+
public let uiFonts: ElementFonts
27+
2528
public var largeTitle: Font
2629

2730
public var largeTitleB: Font
@@ -63,6 +66,8 @@ public struct FontSwiftUI: Fonts {
6366
public var caption2SB: Font
6467

6568
public init(values: ElementFonts) {
69+
self.uiFonts = values
70+
6671
self.largeTitle = Font(values.largeTitle)
6772
self.largeTitleB = Font(values.largeTitleB)
6873
self.title1 = Font(values.title1)
@@ -85,4 +90,3 @@ public struct FontSwiftUI: Fonts {
8590
self.caption2SB = Font(values.caption2SB)
8691
}
8792
}
88-

Podfile

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,10 @@ end
4343

4444
########################################
4545

46+
def import_SwiftUI_pods
47+
pod 'Introspect', '~> 0.1'
48+
end
49+
4650
abstract_target 'RiotPods' do
4751

4852
pod 'GBDeviceInfo', '~> 6.6.0'
@@ -63,6 +67,9 @@ abstract_target 'RiotPods' do
6367

6468
target "Riot" do
6569
import_MatrixKit
70+
71+
import_SwiftUI_pods
72+
6673
pod 'DGCollectionViewLeftAlignFlowLayout', '~> 1.0.4'
6774
pod 'KTCenterFlowLayout', '~> 1.3.1'
6875
pod 'ZXingObjC', '~> 3.6.5'
@@ -73,7 +80,7 @@ abstract_target 'RiotPods' do
7380
pod 'SideMenu', '~> 6.5'
7481
pod 'DSWaveformImage', '~> 6.1.1'
7582
pod 'ffmpeg-kit-ios-audio', '~> 4.5'
76-
83+
7784
pod 'FLEX', '~> 4.5.0', :configurations => ['Debug']
7885

7986
target 'RiotTests' do
@@ -85,6 +92,14 @@ abstract_target 'RiotPods' do
8592
import_MatrixKit
8693
end
8794

95+
target "RiotSwiftUI" do
96+
import_SwiftUI_pods
97+
end
98+
99+
target "RiotSwiftUITests" do
100+
import_SwiftUI_pods
101+
end
102+
88103
target "SiriIntents" do
89104
import_MatrixKit
90105
end

Podfile.lock

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ PODS:
1616
- AFNetworking/NSURLSession
1717
- BlueCryptor (1.0.32)
1818
- BlueECC (1.2.5)
19-
- BlueRSA (1.0.34)
19+
- BlueRSA (1.0.200)
2020
- DGCollectionViewLeftAlignFlowLayout (1.0.4)
2121
- Down (0.11.0)
2222
- DSWaveformImage (6.1.1)
@@ -39,13 +39,13 @@ PODS:
3939
- DTFoundation/Core
4040
- ffmpeg-kit-ios-audio (4.5)
4141
- FLEX (4.5.0)
42-
- FlowCommoniOS (1.12.0)
42+
- FlowCommoniOS (1.12.2)
4343
- GBDeviceInfo (6.6.0):
4444
- GBDeviceInfo/Core (= 6.6.0)
4545
- GBDeviceInfo/Core (6.6.0)
46-
- GrowingTextView (0.7.2)
4746
- GZIP (1.3.0)
4847
- HPGrowingTextView (1.1)
48+
- Introspect (0.1.3)
4949
- JitsiMeetSDK (3.10.2)
5050
- KeychainAccess (4.2.2)
5151
- KituraContracts (1.2.1):
@@ -100,7 +100,7 @@ PODS:
100100
- Reusable/View (4.1.2)
101101
- SideMenu (6.5.0)
102102
- SwiftBase32 (0.9.0)
103-
- SwiftGen (6.4.0)
103+
- SwiftGen (6.5.1)
104104
- SwiftJWT (3.6.200):
105105
- BlueCryptor (~> 1.0)
106106
- BlueECC (~> 1.1)
@@ -122,7 +122,7 @@ DEPENDENCIES:
122122
- FLEX (~> 4.5.0)
123123
- FlowCommoniOS (~> 1.12.0)
124124
- GBDeviceInfo (~> 6.6.0)
125-
- GrowingTextView (~> 0.7.2)
125+
- Introspect (~> 0.1)
126126
- KeychainAccess (~> 4.2.2)
127127
- KTCenterFlowLayout (~> 1.3.1)
128128
- MatomoTracker (~> 7.4.1)
@@ -156,9 +156,9 @@ SPEC REPOS:
156156
- FLEX
157157
- FlowCommoniOS
158158
- GBDeviceInfo
159-
- GrowingTextView
160159
- GZIP
161160
- HPGrowingTextView
161+
- Introspect
162162
- JitsiMeetSDK
163163
- KeychainAccess
164164
- KituraContracts
@@ -188,19 +188,19 @@ SPEC CHECKSUMS:
188188
AFNetworking: 7864c38297c79aaca1500c33288e429c3451fdce
189189
BlueCryptor: b0aee3d9b8f367b49b30de11cda90e1735571c24
190190
BlueECC: 0d18e93347d3ec6d41416de21c1ffa4d4cd3c2cc
191-
BlueRSA: 6f9776d62d9773502415a7db3bcbb2bbb3f71fc3
191+
BlueRSA: dfeef51db96bcc4edec654956c1581adbda4e6a3
192192
DGCollectionViewLeftAlignFlowLayout: a0fa58797373ded039cafba8133e79373d048399
193193
Down: b6ba1bc985c9d2f4e15e3b293d2207766fa12612
194194
DSWaveformImage: 3c718a0cf99291887ee70d1d0c18d80101d3d9ce
195195
DTCoreText: ec749e013f2e1f76de5e7c7634642e600a7467ce
196196
DTFoundation: a53f8cda2489208cbc71c648be177f902ee17536
197197
ffmpeg-kit-ios-audio: 8c44d93054e1a9743a7014ec3dd26cd1ad8f2a59
198198
FLEX: e51461dd6f0bfb00643c262acdfea5d5d12c596b
199-
FlowCommoniOS: e9ecbc97fb9ce5c593fb3da0e1073b65a3902026
199+
FlowCommoniOS: ca92071ab526dc89905495a37844fd7e78d1a7f2
200200
GBDeviceInfo: ed0db16230d2fa280e1cbb39a5a7f60f6946aaec
201-
GrowingTextView: 876bf42005b5e4a4fd740597db12caaf41f0fe6c
202201
GZIP: 416858efbe66b41b206895ac6dfd5493200d95b3
203202
HPGrowingTextView: 88a716d97fb853bcb08a4a08e4727da17efc9b19
203+
Introspect: 2be020f30f084ada52bb4387fff83fa52c5c400e
204204
JitsiMeetSDK: 2f118fa770f23e518f3560fc224fae3ac7062223
205205
KeychainAccess: c0c4f7f38f6fc7bbe58f5702e25f7bd2f65abf51
206206
KituraContracts: e845e60dc8627ad0a76fa55ef20a45451d8f830b
@@ -218,14 +218,14 @@ SPEC CHECKSUMS:
218218
Reusable: 6bae6a5e8aa793c9c441db0213c863a64bce9136
219219
SideMenu: f583187d21c5b1dd04c72002be544b555a2627a2
220220
SwiftBase32: 9399c25a80666dc66b51e10076bf591e3bbb8f17
221-
SwiftGen: 67860cc7c3cfc2ed25b9b74cfd55495fc89f9108
221+
SwiftGen: a6d22010845f08fe18fbdf3a07a8e380fd22e0ea
222222
SwiftJWT: 88c412708f58c169d431d344c87bc79a87c830ae
223223
SwiftLint: e96c0a8c770c7ebbc4d36c55baf9096bb65c4584
224224
SwiftyBeaver: 84069991dd5dca07d7069100985badaca7f0ce82
225225
WeakDictionary: 8cd038acd77e5d54ca4ebaec3d20853d732b45e0
226226
zxcvbn-ios: fef98b7c80f1512ff0eec47ac1fa399fc00f7e3c
227227
ZXingObjC: fdbb269f25dd2032da343e06f10224d62f537bdb
228228

229-
PODFILE CHECKSUM: 2740772a9b2d32e17876526875dfc58f67240ba0
229+
PODFILE CHECKSUM: 56547a5087a419eb4461b0fb59380381194392dc
230230

231231
COCOAPODS: 1.11.2

Riot.xcodeproj/xcshareddata/xcschemes/Riot.xcscheme

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
7-
buildImplicitDependencies = "YES">
7+
buildImplicitDependencies = "YES"
8+
runPostActionsOnFailure = "NO">
89
<BuildActionEntries>
910
<BuildActionEntry
1011
buildForTesting = "YES"
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
{
2+
"images" : [
3+
{
4+
"filename" : "action_poll.png",
5+
"idiom" : "universal",
6+
"scale" : "1x"
7+
},
8+
{
9+
"filename" : "action_poll@2x.png",
10+
"idiom" : "universal",
11+
"scale" : "2x"
12+
},
13+
{
14+
"filename" : "action_poll@3x.png",
15+
"idiom" : "universal",
16+
"scale" : "3x"
17+
}
18+
],
19+
"info" : {
20+
"author" : "xcode",
21+
"version" : 1
22+
}
23+
}
213 Bytes
Loading
245 Bytes
Loading
322 Bytes
Loading
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"info" : {
3+
"author" : "xcode",
4+
"version" : 1
5+
}
6+
}

0 commit comments

Comments
 (0)