Skip to content

Commit b9dd7e8

Browse files
committed
Merge branch 'main'
#Conflicts: # Sources/ExyteChat/ChatView/Recording/RecordWaveform.swift
2 parents 70ccef2 + 0ee75e9 commit b9dd7e8

File tree

3 files changed

+48
-1
lines changed

3 files changed

+48
-1
lines changed

.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata

+7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Package.resolved

+41
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
{
2+
"pins" : [
3+
{
4+
"identity" : "activityindicatorview",
5+
"kind" : "remoteSourceControl",
6+
"location" : "https://github.com/exyte/ActivityIndicatorView",
7+
"state" : {
8+
"revision" : "9970fd0bb7a05dad0b6566ae1f56937716686b24",
9+
"version" : "1.1.1"
10+
}
11+
},
12+
{
13+
"identity" : "floatingbutton",
14+
"kind" : "remoteSourceControl",
15+
"location" : "https://github.com/exyte/FloatingButton",
16+
"state" : {
17+
"revision" : "cf77c2f124df1423d90a9a1985e9b9ccfa4b9b3e",
18+
"version" : "1.3.0"
19+
}
20+
},
21+
{
22+
"identity" : "mediapicker",
23+
"kind" : "remoteSourceControl",
24+
"location" : "https://github.com/exyte/MediaPicker.git",
25+
"state" : {
26+
"revision" : "88769b1b69c2b5e5fa5b65522c08bc7b667a6cb8",
27+
"version" : "2.2.3"
28+
}
29+
},
30+
{
31+
"identity" : "swiftui-introspect",
32+
"kind" : "remoteSourceControl",
33+
"location" : "https://github.com/siteline/swiftui-introspect",
34+
"state" : {
35+
"revision" : "807f73ce09a9b9723f12385e592b4e0aaebd3336",
36+
"version" : "1.3.0"
37+
}
38+
}
39+
],
40+
"version" : 2
41+
}

Sources/ExyteChat/ChatView/Recording/RecordWaveform.swift

-1
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,6 @@ struct RecordWaveformPlaying: View {
105105
.frame(height: RecordWaveform.maxSampleHeight)
106106

107107
}
108-
//.border(Color.red, width: 2)
109108
.frame(height: RecordWaveform.maxSampleHeight)
110109
.applyIf(!addExtraDots) {
111110
$0.frame(width: maxLength)

0 commit comments

Comments
 (0)