Skip to content

Commit

Permalink
0.0.17 (#18)
Browse files Browse the repository at this point in the history 
* Changes

* New version

* Polls prototype

* Update content

* Add missing event

* New version

* Add new actions

* add missing widget

* New version

---------

Co-authored-by: Martin De Simone <[email protected]>
  • Loading branch information
@mdesimone-viafoura @martin-desimone-1
mdesimone-viafoura and martin-desimone-1 authored Aug 1, 2023
1 parent 61a4843 commit 8528e05
Show file tree
Hide file tree
Showing 80 changed files with 15,888 additions and 7,027 deletions.
10 changes: 10 additions & 0 deletions SampleApp/Podfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,13 @@ target 'Viafoura' do
pod 'FirebaseCrashlytics'
pod 'FirebaseMessaging'
end

post_install do |installer|
installer.generated_projects.each do |project|
project.targets.each do |target|
target.build_configurations.each do |config|
config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '13.0'
end
end
end
end
2 changes: 1 addition & 1 deletion SampleApp/Podfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,6 @@ SPEC CHECKSUMS:
PromisesObjC: ab77feca74fa2823e7af4249b8326368e61014cb
SimpleKeychain: b50cef3b87939d480ea1143425c00f5b4b70fe21

PODFILE CHECKSUM: 3d231b9b384bf59ef5823e430d0349291dffa256
PODFILE CHECKSUM: 20fbb42a49edd2e5748e5de5998ab8404cd93804

COCOAPODS: 1.12.0
2 changes: 1 addition & 1 deletion SampleApp/Pods/Manifest.lock
View file

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

188 changes: 100 additions & 88 deletions SampleApp/Pods/Pods.xcodeproj/project.pbxproj
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion SampleApp/Pods/Target Support Files/Pods-Viafoura/Pods-Viafoura-frameworks.sh
View file

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

52 changes: 42 additions & 10 deletions SampleApp/Viafoura.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,6 @@
479B5A2C29D34AFD00734F84 /* LiveBlogViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 479B5A2B29D34AFD00734F84 /* LiveBlogViewModel.swift */; };
47A8F2272832D1E700D9EB8B /* SignUpViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 47A8F2262832D1E700D9EB8B /* SignUpViewModel.swift */; };
47A8F22B2832D1F300D9EB8B /* SignUpViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 47A8F22A2832D1F300D9EB8B /* SignUpViewController.swift */; };
47A90B832A3CCC4A004DE7B9 /* ViafouraSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 47A7E50A2A3215440056AF74 /* ViafouraSDK.framework */; };
47A90B842A3CCC4A004DE7B9 /* ViafouraSDK.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 47A7E50A2A3215440056AF74 /* ViafouraSDK.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
47B0096728179DF800EF93FD /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 47B0096628179DF800EF93FD /* AppDelegate.swift */; };
47B0096928179DF800EF93FD /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 47B0096828179DF800EF93FD /* SceneDelegate.swift */; };
47B0096B28179DF800EF93FD /* HomeViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 47B0096A28179DF800EF93FD /* HomeViewController.swift */; };
Expand All @@ -55,6 +53,14 @@
47DAE50A2922EF72008E95E1 /* LiveChatsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 47DAE5092922EF72008E95E1 /* LiveChatsViewController.swift */; };
47DAE50C2922EF7A008E95E1 /* LiveChatsViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 47DAE50B2922EF7A008E95E1 /* LiveChatsViewModel.swift */; };
47DAE50F2922EF8D008E95E1 /* LiveChatTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 47DAE50E2922EF8D008E95E1 /* LiveChatTableViewCell.swift */; };
47E991D42A780D46006DE6F5 /* ViafouraSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 47A7E50A2A3215440056AF74 /* ViafouraSDK.framework */; };
47E991D52A780D46006DE6F5 /* ViafouraSDK.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 47A7E50A2A3215440056AF74 /* ViafouraSDK.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
47F912E02A683F81004D457C /* PollTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 47F912DF2A683F81004D457C /* PollTableViewCell.swift */; };
47F912E22A684199004D457C /* Content.swift in Sources */ = {isa = PBXBuildFile; fileRef = 47F912E12A684199004D457C /* Content.swift */; };
47F912E42A68419F004D457C /* Poll.swift in Sources */ = {isa = PBXBuildFile; fileRef = 47F912E32A68419F004D457C /* Poll.swift */; };
47F912E72A68431A004D457C /* PollViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 47F912E62A68431A004D457C /* PollViewController.swift */; };
47F912E92A684650004D457C /* PollViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 47F912E82A684650004D457C /* PollViewModel.swift */; };
47F912EB2A684694004D457C /* Poll.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 47F912EA2A684694004D457C /* Poll.storyboard */; };
70ACF1AD7E6B5FDF8B92884B /* Pods_Viafoura.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8D84CA436C59C8B7F6588B2B /* Pods_Viafoura.framework */; };
/* End PBXBuildFile section */

Expand Down Expand Up @@ -86,13 +92,13 @@
name = "Embed Foundation Extensions";
runOnlyForDeploymentPostprocessing = 0;
};
4776BF1F29AAC1D9006C6642 /* Embed Frameworks */ = {
47E991D62A780D46006DE6F5 /* Embed Frameworks */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
dstPath = "";
dstSubfolderSpec = 10;
files = (
47A90B842A3CCC4A004DE7B9 /* ViafouraSDK.framework in Embed Frameworks */,
47E991D52A780D46006DE6F5 /* ViafouraSDK.framework in Embed Frameworks */,
);
name = "Embed Frameworks";
runOnlyForDeploymentPostprocessing = 0;
Expand Down Expand Up @@ -150,6 +156,12 @@
47DAE5092922EF72008E95E1 /* LiveChatsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LiveChatsViewController.swift; sourceTree = "<group>"; };
47DAE50B2922EF7A008E95E1 /* LiveChatsViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LiveChatsViewModel.swift; sourceTree = "<group>"; };
47DAE50E2922EF8D008E95E1 /* LiveChatTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LiveChatTableViewCell.swift; sourceTree = "<group>"; };
47F912DF2A683F81004D457C /* PollTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PollTableViewCell.swift; sourceTree = "<group>"; };
47F912E12A684199004D457C /* Content.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Content.swift; sourceTree = "<group>"; };
47F912E32A68419F004D457C /* Poll.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Poll.swift; sourceTree = "<group>"; };
47F912E62A68431A004D457C /* PollViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PollViewController.swift; sourceTree = "<group>"; };
47F912E82A684650004D457C /* PollViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PollViewModel.swift; sourceTree = "<group>"; };
47F912EA2A684694004D457C /* Poll.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = Poll.storyboard; sourceTree = "<group>"; };
828EF67343F1A1E05E74D4B0 /* Pods-Viafoura.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Viafoura.release.xcconfig"; path = "Target Support Files/Pods-Viafoura/Pods-Viafoura.release.xcconfig"; sourceTree = "<group>"; };
8D84CA436C59C8B7F6588B2B /* Pods_Viafoura.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Viafoura.framework; sourceTree = BUILT_PRODUCTS_DIR; };
/* End PBXFileReference section */
Expand All @@ -159,7 +171,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
47A90B832A3CCC4A004DE7B9 /* ViafouraSDK.framework in Frameworks */,
47E991D42A780D46006DE6F5 /* ViafouraSDK.framework in Frameworks */,
47B1DD39297EC13700FBD05C /* Kingfisher in Frameworks */,
70ACF1AD7E6B5FDF8B92884B /* Pods_Viafoura.framework in Frameworks */,
);
Expand Down Expand Up @@ -224,6 +236,8 @@
4779041A2818E81B0019B2F3 /* Story.swift */,
4771BE2B2935506E00389833 /* Setting.swift */,
4771BE31293556A000389833 /* VCIdentifier.swift */,
47F912E12A684199004D457C /* Content.swift */,
47F912E32A68419F004D457C /* Poll.swift */,
);
path = Model;
sourceTree = "<group>";
Expand All @@ -241,6 +255,7 @@
4779041D2818E8280019B2F3 /* Features */ = {
isa = PBXGroup;
children = (
47F912E52A684312004D457C /* Poll */,
47CB993C29E3866F0070FF2B /* LiveChat */,
479B5A2829D34A9400734F84 /* LiveBlog */,
4771BE2E2935544500389833 /* CommentsContainer */,
Expand Down Expand Up @@ -270,6 +285,7 @@
isa = PBXGroup;
children = (
477904142818E73D0019B2F3 /* StoryTableViewCell.swift */,
47F912DF2A683F81004D457C /* PollTableViewCell.swift */,
);
path = Cell;
sourceTree = "<group>";
Expand Down Expand Up @@ -402,6 +418,16 @@
path = Cell;
sourceTree = "<group>";
};
47F912E52A684312004D457C /* Poll */ = {
isa = PBXGroup;
children = (
47F912E62A68431A004D457C /* PollViewController.swift */,
47F912E82A684650004D457C /* PollViewModel.swift */,
47F912EA2A684694004D457C /* Poll.storyboard */,
);
path = Poll;
sourceTree = "<group>";
};
647EE21E98ADD6C38637E6BB /* Pods */ = {
isa = PBXGroup;
children = (
Expand All @@ -424,8 +450,8 @@
47B0096128179DF800EF93FD /* Resources */,
5AAEF5A1819B1F8289A16C03 /* [CP] Embed Pods Frameworks */,
47162763293FAA9400729F25 /* Embed Foundation Extensions */,
4776BF1F29AAC1D9006C6642 /* Embed Frameworks */,
4710CE282A1689A900A4115D /* ShellScript */,
47E991D62A780D46006DE6F5 /* Embed Frameworks */,
);
buildRules = (
);
Expand Down Expand Up @@ -516,6 +542,7 @@
4707010028CBEBC500BE9C0D /* GoogleService-Info.plist in Resources */,
47B0097028179DFB00EF93FD /* Assets.xcassets in Resources */,
47B0096E28179DF800EF93FD /* Main.storyboard in Resources */,
47F912EB2A684694004D457C /* Poll.storyboard in Resources */,
4707010828CFAD2C00BE9C0D /* LoginRadius.plist in Resources */,
47CB996C29E586B60070FF2B /* LiveChat.storyboard in Resources */,
);
Expand Down Expand Up @@ -590,8 +617,10 @@
buildActionMask = 2147483647;
files = (
47DAE50A2922EF72008E95E1 /* LiveChatsViewController.swift in Sources */,
47F912E92A684650004D457C /* PollViewModel.swift in Sources */,
477904262818EAB90019B2F3 /* LoginViewController.swift in Sources */,
47A8F2272832D1E700D9EB8B /* SignUpViewModel.swift in Sources */,
47F912E22A684199004D457C /* Content.swift in Sources */,
4779041B2818E81B0019B2F3 /* Story.swift in Sources */,
4771BE302935545600389833 /* CommentsContainerViewController.swift in Sources */,
47CB997329E589700070FF2B /* StoryboardCreatable.swift in Sources */,
Expand All @@ -604,6 +633,8 @@
4771BE32293556A100389833 /* VCIdentifier.swift in Sources */,
4771BE342935571D00389833 /* CommentsContainerViewModel.swift in Sources */,
477904282818EC6C0019B2F3 /* ArticleViewModel.swift in Sources */,
47F912E02A683F81004D457C /* PollTableViewCell.swift in Sources */,
47F912E72A68431A004D457C /* PollViewController.swift in Sources */,
47DAE50C2922EF7A008E95E1 /* LiveChatsViewModel.swift in Sources */,
473DBC2C285A59E30044D00F /* CustomNavigationController.swift in Sources */,
477904182818E7FF0019B2F3 /* HomeViewModel.swift in Sources */,
Expand All @@ -612,6 +643,7 @@
477904112818E2CC0019B2F3 /* ArticleViewController.swift in Sources */,
47CB994029E386820070FF2B /* LiveChatViewModel.swift in Sources */,
47DAE50F2922EF8D008E95E1 /* LiveChatTableViewCell.swift in Sources */,
47F912E42A68419F004D457C /* Poll.swift in Sources */,
47A8F22B2832D1F300D9EB8B /* SignUpViewController.swift in Sources */,
4771BE2829354C4E00389833 /* SettingsViewModel.swift in Sources */,
4795030B2819D05D00ED9E56 /* LoginViewModel.swift in Sources */,
Expand Down Expand Up @@ -767,7 +799,7 @@
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_ENTITLEMENTS = Viafoura/Viafoura.entitlements;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 34;
CURRENT_PROJECT_VERSION = 38;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = JJ3874BH56;
GENERATE_INFOPLIST_FILE = YES;
Expand All @@ -782,7 +814,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.0.33;
MARKETING_VERSION = 1.0.37;
PRODUCT_BUNDLE_IDENTIFIER = com.viafoura.sampleapp;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_EMIT_LOC_STRINGS = YES;
Expand All @@ -799,7 +831,7 @@
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_ENTITLEMENTS = Viafoura/Viafoura.entitlements;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 34;
CURRENT_PROJECT_VERSION = 38;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = JJ3874BH56;
GENERATE_INFOPLIST_FILE = YES;
Expand All @@ -814,7 +846,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.0.33;
MARKETING_VERSION = 1.0.37;
PRODUCT_BUNDLE_IDENTIFIER = com.viafoura.sampleapp;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_EMIT_LOC_STRINGS = YES;
Expand Down
2 changes: 2 additions & 0 deletions SampleApp/Viafoura/AppDelegate.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ class AppDelegate: UIResponder, UIApplicationDelegate, MessagingDelegate, UNUser

func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
ViafouraSDK.initialize(siteUUID: "00000000-0000-4000-8000-c8cddfd7b365", siteDomain: "viafoura-mobile-demo.vercel.app")
//ViafouraSDK.initialize(siteUUID: "00000000-0000-4000-8000-a3692e0c0e77", siteDomain: "test.viafoura.com")
//ViafouraSDK.initialize(siteUUID: "00000000-0000-4000-8000-0892b54dbf4e", siteDomain: "reactqa5.smgdigitaldev.com")

FirebaseApp.configure()

Expand Down
8 changes: 6 additions & 2 deletions SampleApp/Viafoura/Features/Article/ArticleViewController.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ class ArticleViewController: UIViewController, StoryboardCreateable {
preCommentsViewController.setActionCallbacks(callbacks: callbacks)
preCommentsViewController.setAdDelegate(adDelegate: self)
preCommentsViewController.setLayoutDelegate(layoutDelegate: self)
preCommentsViewController.setAuthorsIds(authors: [articleViewModel.story.authorId])
preCommentsViewController.setAuthorsIds(authors: [articleViewModel.story.authorId] )

if let contentUUID = articleViewModel.selectedContentUUID {
preCommentsViewController.getContentScrollPosition(contentUUID: contentUUID, completion: { [weak self] yPosition in
Expand Down Expand Up @@ -220,7 +220,7 @@ class ArticleViewController: UIViewController, StoryboardCreateable {
return
}

if let story = defaultStories.filter { $0.containerId == containerId }.first {
if let content = defaultContents.filter({ $0.story?.containerId == containerId }).first, let story = content.story {
articleVC.articleViewModel = ArticleViewModel(story: story)
articleVC.articleViewModel.selectedContentUUID = contentUUID
articleVC.hidesBottomBarWhenPushed = true
Expand All @@ -235,6 +235,8 @@ class ArticleViewController: UIViewController, StoryboardCreateable {

let callbacks: VFActionsCallbacks = { type in
switch type {
case .commentPosted(let contentUUID):
break
default:
break
}
Expand Down Expand Up @@ -296,6 +298,8 @@ extension ArticleViewController: VFLoginDelegate {
extension ArticleViewController: VFCustomUIDelegate {
func customizeView(theme: VFTheme, view: VFCustomizableView) {
switch view {
case .profileLogoutLabel(let label):
label.isHidden = true
case .previewBackgroundView(let view):
if theme == VFTheme.dark {
view.backgroundColor = darkBackgroundColor
Expand Down
31 changes: 31 additions & 0 deletions SampleApp/Viafoura/Features/Home/Cell/PollTableViewCell.swift
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
//
// PollTableViewCell.swift
// Viafoura
//
// Created by Martin De Simone on 19/07/2023.
//

import UIKit
class PollTableViewCell: UITableViewCell{

@IBOutlet weak var containerView: UIView!
@IBOutlet weak var containerImage: UIImageView!
@IBOutlet weak var containerLabel: UILabel!

func setup(forPoll poll: Poll){
containerLabel.text = poll.title

containerView.backgroundColor = .white
containerView.layer.masksToBounds = false
containerView.layer.cornerCurve = .continuous
containerView.layer.cornerRadius = 12
containerView.layer.shadowColor = UIColor.black.cgColor
containerView.layer.shadowOffset = CGSize(width: 0, height: 2)
containerView.layer.shadowRadius = 8
containerView.layer.shadowOpacity = 0.15
containerView.layer.rasterizationScale = UIScreen.main.scale
containerView.layer.shouldRasterize = true

selectionStyle = .none
}
}
5 changes: 0 additions & 5 deletions SampleApp/Viafoura/Features/Home/Cell/StoryTableViewCell.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,4 @@ class StoryTableViewCell: UITableViewCell{

selectionStyle = .none
}

@objc
func shareTapped(){

}
}
Loading

0 comments on commit 8528e05

Please sign in to comment.