Skip to content

Commit

Permalink
Merge dev into master (#29)
Browse files Browse the repository at this point in the history
* Project setup, theme, chat, app settings

* Feature/guic 83 chat in queue (#1)


* Queue view, CR changes

* added dev team (#2)

* added profile and code sign identity (#3)

* changed shared scheme

* changed framework embedding

* added Carthage frameworks properly

* added appcenter-pre-build.sh

* added appcenter-post-clone.sh

* disable AppCenter Carthage builds

* Feature/g UI c 85 leave queue UI (#4)

* reusable alert view

* Feature/g UI c 92 queue (#5)

* operator queue
* glia window

* Feature/g UI c 11 chat messages (#6)

* Chat implementation
* CR changes

* Feature/g UI c 9 chat history (#7)

* bug fixes
* added ChatStorage

* fixed chat scroll offset (#8)

* Feature/rotation fix (#9)

* rotation fix

* added view controller to bubble window

* Audio call (#10)

* audio calls

* Feature/m UI c 104 fixes (#11)

* switch action button colors

* end button rework

* bubble fix

* status bar fix

* scroll last chat cell visible on rotate

* change shadow offset

* layout fixes (#12)

* Video call (#13)

* video calls

* Unread messages badges (#14)

* added BadgeView

* unread message count for bubble

* show unread badge in call view

* refactoring

* refactoring

* CR fixes

* show call bubble in chat (#15)

* Add support for Swift Package Manager

* Create LICENSE

* [MUIC-44] Add screen sharing support (#17)

* Feature/m UI c 199 scenes (#18)

* support for scenes

* CR changes

* Release version 0.2.0

* optional powered by (#21)

* Feature/m UI c 13 send files (#20)

* File uploads
* File attachment sending
* File downloads

* Feature/m UI c 243 chat restore (#22)

* re-worked Glia delegate

* improved glia events

* reworked Glia to singleton

* renamed shared

* updated SDK, interactor state check

* [MUIC-203] Update development team and provisioning profile (#24)

* File upload/download improvements & fixes (#25)

* added max uploads check

* added NSPhotoLibraryAddUsageDescription

* CR changes

* Feature/m UI c 236 fixes (#28)

* stretched popover fix

* audio/video indicator fix

* memory issue fix

* added audio background mode

* CR changes

Co-authored-by: Eigo Madaloja <[email protected]>
Co-authored-by: Gerson Noboa <[email protected]>
  • Loading branch information
3 people authored Apr 13, 2021
1 parent 07f7c95 commit 412778f
Show file tree
Hide file tree
Showing 254 changed files with 15,063 additions and 170 deletions.
5 changes: 2 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ playground.xcworkspace
# you should judge for yourself, the pros and cons are mentioned at:
# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
#
# Pods/
Pods/
#
# Add this line if you want to avoid checking in source code from the Xcode workspace
# *.xcworkspace
Expand All @@ -61,8 +61,7 @@ playground.xcworkspace
#
# Add this line if you want to avoid checking in source code from Carthage dependencies.

Carthage/Checkouts
Carthage/Build
Carthage/

# fastlane
#
Expand Down
43 changes: 43 additions & 0 deletions .swiftlint.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
disabled_rules:
- identifier_name
- nesting
- implicit_return
- function_parameter_count
- weak_delegate
opt_in_rules:
- empty_count
- implicit_return
- nimble_operator
- operator_usage_whitespace
- unneeded_parentheses_in_closure_argument
- literal_expression_end_indentation
- closure_spacing
- closure_end_indentation
- force_unwrapping
excluded: # paths to ignore during linting. Takes precedence over `included`.
- Carthage
- Pods

cyclomatic_complexity:
ignores_case_statements: true

force_cast: warning
force_try:
severity: warning

line_length:
warning: 150
error: 160
ignores_urls: true
ignores_function_declarations: true
ignores_comments: true

file_length:
warning: 1000
error: 1200

function_body_length:
warning: 50
error: 100

reporter: "xcode" # reporter type (xcode, json, csv, checkstyle, junit, html, emoji)
7 changes: 7 additions & 0 deletions .swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1,732 changes: 1,680 additions & 52 deletions GliaWidgets.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

77 changes: 77 additions & 0 deletions GliaWidgets.xcodeproj/xcshareddata/xcschemes/GliaWidgets.xcscheme
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1240"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "1A205D5725655CB1003AA3CD"
BuildableName = "GliaWidgets.framework"
BlueprintName = "GliaWidgets"
ReferencedContainer = "container:GliaWidgets.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "1A205D6025655CB2003AA3CD"
BuildableName = "GliaWidgetsTests.xctest"
BlueprintName = "GliaWidgetsTests"
ReferencedContainer = "container:GliaWidgets.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "1A205D5725655CB1003AA3CD"
BuildableName = "GliaWidgets.framework"
BlueprintName = "GliaWidgets"
ReferencedContainer = "container:GliaWidgets.xcodeproj">
</BuildableReference>
</MacroExpansion>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
78 changes: 78 additions & 0 deletions GliaWidgets.xcodeproj/xcshareddata/xcschemes/TestingApp.xcscheme
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1240"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "1A205D7725655CEC003AA3CD"
BuildableName = "TestingApp.app"
BlueprintName = "TestingApp"
ReferencedContainer = "container:GliaWidgets.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
</Testables>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "1A205D7725655CEC003AA3CD"
BuildableName = "TestingApp.app"
BlueprintName = "TestingApp"
ReferencedContainer = "container:GliaWidgets.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "1A205D7725655CEC003AA3CD"
BuildableName = "TestingApp.app"
BlueprintName = "TestingApp"
ReferencedContainer = "container:GliaWidgets.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,24 @@
<dict>
<key>SchemeUserState</key>
<dict>
<key>GliaWidgets.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>0</integer>
</dict>
<key>TestingApp.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>1</integer>
</dict>
</dict>
<key>SuppressBuildableAutocreation</key>
<dict>
<key>1A205D5725655CB1003AA3CD</key>
<dict>
<key>primary</key>
<true/>
</dict>
<key>1A205D6025655CB2003AA3CD</key>
<dict>
<key>primary</key>
<true/>
</dict>
</dict>
</dict>
</plist>
10 changes: 10 additions & 0 deletions GliaWidgets.xcworkspace/contents.xcworkspacedata

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions GliaWidgets.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>IDEDidComputeMac32BitWarning</key>
<true/>
</dict>
</plist>
1 change: 1 addition & 0 deletions GliaWidgets/Cartfile
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
github "PureLayout/PureLayout" "v3.1.6"
1 change: 1 addition & 0 deletions GliaWidgets/Cartfile.resolved
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
github "PureLayout/PureLayout" "v3.1.6"
15 changes: 15 additions & 0 deletions GliaWidgets/Component/Badge/BadgeStyle.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
import UIKit

public struct BadgeStyle {
public var font: UIFont
public var fontColor: UIColor
public var backgroundColor: UIColor

public init(font: UIFont,
fontColor: UIColor,
backgroundColor: UIColor) {
self.font = font
self.fontColor = fontColor
self.backgroundColor = backgroundColor
}
}
49 changes: 49 additions & 0 deletions GliaWidgets/Component/Badge/BadgeView.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
import UIKit

class BadgeView: UIView {
var newItemCount: Int = 0 {
didSet {
if newItemCount <= 0 {
isHidden = true
} else {
isHidden = false
countLabel.text = "\(newItemCount)"
}
}
}
let size: CGFloat = 18

private let style: BadgeStyle
private let countLabel = UILabel()

public init(with style: BadgeStyle) {
self.style = style
super.init(frame: .zero)
setup()
layout()
}

@available(*, unavailable)
required init?(coder _: NSCoder) {
fatalError("init(coder:) has not been implemented")
}

private func setup() {
clipsToBounds = true
layer.cornerRadius = size / 2
backgroundColor = style.backgroundColor

countLabel.font = style.font
countLabel.textColor = style.fontColor
countLabel.textAlignment = .center
countLabel.adjustsFontSizeToFitWidth = true
countLabel.minimumScaleFactor = 0.8
}

private func layout() {
autoSetDimensions(to: CGSize(width: size, height: size))

addSubview(countLabel)
countLabel.autoPinEdgesToSuperviewEdges(with: UIEdgeInsets(top: 2, left: 2, bottom: 2, right: 2))
}
}
Loading

0 comments on commit 412778f

Please sign in to comment.