diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..2c0702ee
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,6 @@
+Carthage
+xcuserdata
+.DS_Store
+
+report.xml
+test_output
\ No newline at end of file
diff --git a/Cartfile b/Cartfile
new file mode 100644
index 00000000..597b68d5
--- /dev/null
+++ b/Cartfile
@@ -0,0 +1,3 @@
+github "SRGSSR/SRGMediaPlayer-iOS" "2.0"
+github "SRGSSR/srgdataprovider-ios" "5.0"
+github "comScore/ComScore-iOS-SDK" "92f34897cd7659d56bb5a3e9e85b808cf3758bda"
\ No newline at end of file
diff --git a/Cartfile.resolved b/Cartfile.resolved
new file mode 100644
index 00000000..6330feaa
--- /dev/null
+++ b/Cartfile.resolved
@@ -0,0 +1,7 @@
+github "Mantle/Mantle" "2.1.0"
+github "SRGSSR/MAKVONotificationCenter" "4a127e52997889729286510103f7e27100223730"
+github "SRGSSR/SRGMediaPlayer-iOS" "2.0"
+github "SRGSSR/libextobjc" "076c968c9ade619ee836c89a935e09e6708d6ef2"
+github "SRGSSR/srgdataprovider-ios" "5.0"
+github "SRGSSR/srglogger-ios" "1.0"
+github "comScore/ComScore-iOS-SDK" "92f34897cd7659d56bb5a3e9e85b808cf3758bda"
diff --git a/Demo/Cartfile b/Demo/Cartfile
new file mode 100644
index 00000000..2a037ea8
--- /dev/null
+++ b/Demo/Cartfile
@@ -0,0 +1 @@
+github "kif-framework/KIF" == 3.5.1
\ No newline at end of file
diff --git a/Demo/Cartfile.resolved b/Demo/Cartfile.resolved
new file mode 100644
index 00000000..b4e6f8e5
--- /dev/null
+++ b/Demo/Cartfile.resolved
@@ -0,0 +1 @@
+github "kif-framework/KIF" "v3.5.1"
diff --git a/RTSAnalytics Demo/RTSAnalytics Demo/Supporting Files/Info.plist b/Demo/Info.plist
similarity index 85%
rename from RTSAnalytics Demo/RTSAnalytics Demo/Supporting Files/Info.plist
rename to Demo/Info.plist
index 4d5d5a49..730c9deb 100644
--- a/RTSAnalytics Demo/RTSAnalytics Demo/Supporting Files/Info.plist
+++ b/Demo/Info.plist
@@ -15,11 +15,11 @@
CFBundlePackageType
APPL
CFBundleShortVersionString
- 1.0
+ $(MARKETING_VERSION)
CFBundleSignature
????
CFBundleVersion
- 1
+ $(CURRENT_PROJECT_VERSION)
LSRequiresIPhoneOS
NSAppTransportSecurity
@@ -29,8 +29,6 @@
UILaunchStoryboardName
LaunchScreen
- UIMainStoryboardFile
- Main
UIRequiredDeviceCapabilities
armv7
@@ -48,12 +46,5 @@
UIInterfaceOrientationLandscapeLeft
UIInterfaceOrientationLandscapeRight
- RTSAnalytics
-
- ComscoreVirtualSite
- rts-app-test-v
- NetmetrixAppID
- test
-
diff --git a/RTSAnalytics Demo/RTSAnalytics Demo/Resources/Images.xcassets/AppIcon.appiconset/Contents.json b/Demo/Resources/Images.xcassets/AppIcon.appiconset/Contents.json
similarity index 83%
rename from RTSAnalytics Demo/RTSAnalytics Demo/Resources/Images.xcassets/AppIcon.appiconset/Contents.json
rename to Demo/Resources/Images.xcassets/AppIcon.appiconset/Contents.json
index cddcad5d..21be3f88 100644
--- a/RTSAnalytics Demo/RTSAnalytics Demo/Resources/Images.xcassets/AppIcon.appiconset/Contents.json
+++ b/Demo/Resources/Images.xcassets/AppIcon.appiconset/Contents.json
@@ -1,5 +1,15 @@
{
"images" : [
+ {
+ "idiom" : "iphone",
+ "size" : "20x20",
+ "scale" : "2x"
+ },
+ {
+ "idiom" : "iphone",
+ "size" : "20x20",
+ "scale" : "3x"
+ },
{
"size" : "29x29",
"idiom" : "iphone",
@@ -36,6 +46,16 @@
"filename" : "Icon-60@3x.png",
"scale" : "3x"
},
+ {
+ "idiom" : "ipad",
+ "size" : "20x20",
+ "scale" : "1x"
+ },
+ {
+ "idiom" : "ipad",
+ "size" : "20x20",
+ "scale" : "2x"
+ },
{
"size" : "29x29",
"idiom" : "ipad",
diff --git a/RTSAnalytics Demo/RTSAnalytics Demo/Resources/Images.xcassets/AppIcon.appiconset/Icon-60@2x.png b/Demo/Resources/Images.xcassets/AppIcon.appiconset/Icon-60@2x.png
similarity index 100%
rename from RTSAnalytics Demo/RTSAnalytics Demo/Resources/Images.xcassets/AppIcon.appiconset/Icon-60@2x.png
rename to Demo/Resources/Images.xcassets/AppIcon.appiconset/Icon-60@2x.png
diff --git a/RTSAnalytics Demo/RTSAnalytics Demo/Resources/Images.xcassets/AppIcon.appiconset/Icon-60@3x.png b/Demo/Resources/Images.xcassets/AppIcon.appiconset/Icon-60@3x.png
similarity index 100%
rename from RTSAnalytics Demo/RTSAnalytics Demo/Resources/Images.xcassets/AppIcon.appiconset/Icon-60@3x.png
rename to Demo/Resources/Images.xcassets/AppIcon.appiconset/Icon-60@3x.png
diff --git a/RTSAnalytics Demo/RTSAnalytics Demo/Resources/Images.xcassets/AppIcon.appiconset/Icon-76.png b/Demo/Resources/Images.xcassets/AppIcon.appiconset/Icon-76.png
similarity index 100%
rename from RTSAnalytics Demo/RTSAnalytics Demo/Resources/Images.xcassets/AppIcon.appiconset/Icon-76.png
rename to Demo/Resources/Images.xcassets/AppIcon.appiconset/Icon-76.png
diff --git a/RTSAnalytics Demo/RTSAnalytics Demo/Resources/Images.xcassets/AppIcon.appiconset/Icon-76@2x.png b/Demo/Resources/Images.xcassets/AppIcon.appiconset/Icon-76@2x.png
similarity index 100%
rename from RTSAnalytics Demo/RTSAnalytics Demo/Resources/Images.xcassets/AppIcon.appiconset/Icon-76@2x.png
rename to Demo/Resources/Images.xcassets/AppIcon.appiconset/Icon-76@2x.png
diff --git a/RTSAnalytics Demo/RTSAnalytics Demo/Resources/Images.xcassets/AppIcon.appiconset/Icon-Small-40.png b/Demo/Resources/Images.xcassets/AppIcon.appiconset/Icon-Small-40.png
similarity index 100%
rename from RTSAnalytics Demo/RTSAnalytics Demo/Resources/Images.xcassets/AppIcon.appiconset/Icon-Small-40.png
rename to Demo/Resources/Images.xcassets/AppIcon.appiconset/Icon-Small-40.png
diff --git a/RTSAnalytics Demo/RTSAnalytics Demo/Resources/Images.xcassets/AppIcon.appiconset/Icon-Small-40@2x-1.png b/Demo/Resources/Images.xcassets/AppIcon.appiconset/Icon-Small-40@2x-1.png
similarity index 100%
rename from RTSAnalytics Demo/RTSAnalytics Demo/Resources/Images.xcassets/AppIcon.appiconset/Icon-Small-40@2x-1.png
rename to Demo/Resources/Images.xcassets/AppIcon.appiconset/Icon-Small-40@2x-1.png
diff --git a/RTSAnalytics Demo/RTSAnalytics Demo/Resources/Images.xcassets/AppIcon.appiconset/Icon-Small-40@2x.png b/Demo/Resources/Images.xcassets/AppIcon.appiconset/Icon-Small-40@2x.png
similarity index 100%
rename from RTSAnalytics Demo/RTSAnalytics Demo/Resources/Images.xcassets/AppIcon.appiconset/Icon-Small-40@2x.png
rename to Demo/Resources/Images.xcassets/AppIcon.appiconset/Icon-Small-40@2x.png
diff --git a/RTSAnalytics Demo/RTSAnalytics Demo/Resources/Images.xcassets/AppIcon.appiconset/Icon-Small-40@3x.png b/Demo/Resources/Images.xcassets/AppIcon.appiconset/Icon-Small-40@3x.png
similarity index 100%
rename from RTSAnalytics Demo/RTSAnalytics Demo/Resources/Images.xcassets/AppIcon.appiconset/Icon-Small-40@3x.png
rename to Demo/Resources/Images.xcassets/AppIcon.appiconset/Icon-Small-40@3x.png
diff --git a/RTSAnalytics Demo/RTSAnalytics Demo/Resources/Images.xcassets/AppIcon.appiconset/Icon-Small.png b/Demo/Resources/Images.xcassets/AppIcon.appiconset/Icon-Small.png
similarity index 100%
rename from RTSAnalytics Demo/RTSAnalytics Demo/Resources/Images.xcassets/AppIcon.appiconset/Icon-Small.png
rename to Demo/Resources/Images.xcassets/AppIcon.appiconset/Icon-Small.png
diff --git a/RTSAnalytics Demo/RTSAnalytics Demo/Resources/Images.xcassets/AppIcon.appiconset/Icon-Small@2x-1.png b/Demo/Resources/Images.xcassets/AppIcon.appiconset/Icon-Small@2x-1.png
similarity index 100%
rename from RTSAnalytics Demo/RTSAnalytics Demo/Resources/Images.xcassets/AppIcon.appiconset/Icon-Small@2x-1.png
rename to Demo/Resources/Images.xcassets/AppIcon.appiconset/Icon-Small@2x-1.png
diff --git a/RTSAnalytics Demo/RTSAnalytics Demo/Resources/Images.xcassets/AppIcon.appiconset/Icon-Small@2x.png b/Demo/Resources/Images.xcassets/AppIcon.appiconset/Icon-Small@2x.png
similarity index 100%
rename from RTSAnalytics Demo/RTSAnalytics Demo/Resources/Images.xcassets/AppIcon.appiconset/Icon-Small@2x.png
rename to Demo/Resources/Images.xcassets/AppIcon.appiconset/Icon-Small@2x.png
diff --git a/RTSAnalytics Demo/RTSAnalytics Demo/Resources/Images.xcassets/AppIcon.appiconset/Icon-Small@3x.png b/Demo/Resources/Images.xcassets/AppIcon.appiconset/Icon-Small@3x.png
similarity index 100%
rename from RTSAnalytics Demo/RTSAnalytics Demo/Resources/Images.xcassets/AppIcon.appiconset/Icon-Small@3x.png
rename to Demo/Resources/Images.xcassets/AppIcon.appiconset/Icon-Small@3x.png
diff --git a/RTSAnalytics Demo/RTSAnalytics Demo/Resources/Images.xcassets/AppIcon.appiconset/icon83.5@2x.png b/Demo/Resources/Images.xcassets/AppIcon.appiconset/icon83.5@2x.png
similarity index 100%
rename from RTSAnalytics Demo/RTSAnalytics Demo/Resources/Images.xcassets/AppIcon.appiconset/icon83.5@2x.png
rename to Demo/Resources/Images.xcassets/AppIcon.appiconset/icon83.5@2x.png
diff --git a/Demo/Resources/Images.xcassets/Contents.json b/Demo/Resources/Images.xcassets/Contents.json
new file mode 100644
index 00000000..da4a164c
--- /dev/null
+++ b/Demo/Resources/Images.xcassets/Contents.json
@@ -0,0 +1,6 @@
+{
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/RTSAnalytics Demo/RTSAnalytics Demo/Resources/Images.xcassets/LaunchImage.launchimage/Contents.json b/Demo/Resources/Images.xcassets/LaunchImage.launchimage/Contents.json
similarity index 100%
rename from RTSAnalytics Demo/RTSAnalytics Demo/Resources/Images.xcassets/LaunchImage.launchimage/Contents.json
rename to Demo/Resources/Images.xcassets/LaunchImage.launchimage/Contents.json
diff --git a/RTSAnalytics Demo/RTSAnalytics Demo/Resources/Images.xcassets/LaunchImage.launchimage/LaunchImage-Landscape@2x~ipad.png b/Demo/Resources/Images.xcassets/LaunchImage.launchimage/LaunchImage-Landscape@2x~ipad.png
similarity index 100%
rename from RTSAnalytics Demo/RTSAnalytics Demo/Resources/Images.xcassets/LaunchImage.launchimage/LaunchImage-Landscape@2x~ipad.png
rename to Demo/Resources/Images.xcassets/LaunchImage.launchimage/LaunchImage-Landscape@2x~ipad.png
diff --git a/RTSAnalytics Demo/RTSAnalytics Demo/Resources/Images.xcassets/LaunchImage.launchimage/LaunchImage-Portrait@2x~ipad.png b/Demo/Resources/Images.xcassets/LaunchImage.launchimage/LaunchImage-Portrait@2x~ipad.png
similarity index 100%
rename from RTSAnalytics Demo/RTSAnalytics Demo/Resources/Images.xcassets/LaunchImage.launchimage/LaunchImage-Portrait@2x~ipad.png
rename to Demo/Resources/Images.xcassets/LaunchImage.launchimage/LaunchImage-Portrait@2x~ipad.png
diff --git a/RTSAnalytics Demo/RTSAnalytics Demo/Resources/Images.xcassets/LaunchImage.launchimage/LaunchImage@2x~iphone.png b/Demo/Resources/Images.xcassets/LaunchImage.launchimage/LaunchImage@2x~iphone.png
similarity index 100%
rename from RTSAnalytics Demo/RTSAnalytics Demo/Resources/Images.xcassets/LaunchImage.launchimage/LaunchImage@2x~iphone.png
rename to Demo/Resources/Images.xcassets/LaunchImage.launchimage/LaunchImage@2x~iphone.png
diff --git a/RTSAnalytics Demo/RTSAnalytics Demo/Resources/Images.xcassets/LaunchImage.launchimage/LaunchImageRetina~iphone.png b/Demo/Resources/Images.xcassets/LaunchImage.launchimage/LaunchImageRetina~iphone.png
similarity index 100%
rename from RTSAnalytics Demo/RTSAnalytics Demo/Resources/Images.xcassets/LaunchImage.launchimage/LaunchImageRetina~iphone.png
rename to Demo/Resources/Images.xcassets/LaunchImage.launchimage/LaunchImageRetina~iphone.png
diff --git a/Demo/Resources/Images.xcassets/close_button.imageset/Contents.json b/Demo/Resources/Images.xcassets/close_button.imageset/Contents.json
new file mode 100644
index 00000000..68ab20db
--- /dev/null
+++ b/Demo/Resources/Images.xcassets/close_button.imageset/Contents.json
@@ -0,0 +1,22 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "filename" : "close_button.png",
+ "scale" : "1x"
+ },
+ {
+ "idiom" : "universal",
+ "filename" : "close_button@2x.png",
+ "scale" : "2x"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/Demo/Resources/Images.xcassets/close_button.imageset/close_button.png b/Demo/Resources/Images.xcassets/close_button.imageset/close_button.png
new file mode 100644
index 00000000..0ebf55f6
Binary files /dev/null and b/Demo/Resources/Images.xcassets/close_button.imageset/close_button.png differ
diff --git a/Demo/Resources/Images.xcassets/close_button.imageset/close_button@2x.png b/Demo/Resources/Images.xcassets/close_button.imageset/close_button@2x.png
new file mode 100644
index 00000000..45fde2da
Binary files /dev/null and b/Demo/Resources/Images.xcassets/close_button.imageset/close_button@2x.png differ
diff --git a/RTSAnalytics Demo/RTSAnalytics Demo/Storyboard/Base.lproj/LaunchScreen.xib b/Demo/Resources/LaunchScreen.xib
similarity index 87%
rename from RTSAnalytics Demo/RTSAnalytics Demo/Storyboard/Base.lproj/LaunchScreen.xib
rename to Demo/Resources/LaunchScreen.xib
index 51663797..3878b68a 100644
--- a/RTSAnalytics Demo/RTSAnalytics Demo/Storyboard/Base.lproj/LaunchScreen.xib
+++ b/Demo/Resources/LaunchScreen.xib
@@ -1,8 +1,8 @@
-
+
-
+
@@ -12,7 +12,7 @@
-