Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update with new default parameters #221

Open
wants to merge 4 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Example/SitumWayfinding.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -589,7 +589,7 @@
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
MODULE_NAME = ExampleApp;
PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.SitumWayfinding-Example";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
SWIFT_VERSION = 4.2;
Expand All @@ -608,7 +608,7 @@
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
MODULE_NAME = ExampleApp;
PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.SitumWayfinding-Example";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
SWIFT_VERSION = 4.2;
Expand All @@ -629,7 +629,7 @@
);
INFOPLIST_FILE = Tests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.SitumWayfinding-Example";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
SWIFT_VERSION = 4.0;
Expand All @@ -647,7 +647,7 @@
);
INFOPLIST_FILE = Tests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.SitumWayfinding-Example";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
SWIFT_VERSION = 4.0;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,97 +2,107 @@
"images" : [
{
"idiom" : "iphone",
"size" : "20x20",
"scale" : "2x"
"scale" : "2x",
"size" : "20x20"
},
{
"idiom" : "iphone",
"size" : "20x20",
"scale" : "3x"
"scale" : "3x",
"size" : "20x20"
},
{
"idiom" : "iphone",
"size" : "29x29",
"scale" : "2x"
"scale" : "1x",
"size" : "29x29"
},
{
"idiom" : "iphone",
"size" : "29x29",
"scale" : "3x"
"scale" : "2x",
"size" : "29x29"
},
{
"idiom" : "iphone",
"size" : "40x40",
"scale" : "2x"
"scale" : "3x",
"size" : "29x29"
},
{
"idiom" : "iphone",
"size" : "40x40",
"scale" : "3x"
"scale" : "2x",
"size" : "40x40"
},
{
"idiom" : "iphone",
"size" : "60x60",
"scale" : "2x"
"scale" : "3x",
"size" : "40x40"
},
{
"idiom" : "iphone",
"size" : "60x60",
"scale" : "3x"
"scale" : "2x",
"size" : "60x60"
},
{
"idiom" : "iphone",
"scale" : "3x",
"size" : "60x60"
},
{
"idiom" : "ipad",
"size" : "20x20",
"scale" : "1x"
"scale" : "1x",
"size" : "20x20"
},
{
"idiom" : "ipad",
"size" : "20x20",
"scale" : "2x"
"scale" : "2x",
"size" : "20x20"
},
{
"idiom" : "ipad",
"size" : "29x29",
"scale" : "1x"
"scale" : "1x",
"size" : "29x29"
},
{
"idiom" : "ipad",
"size" : "29x29",
"scale" : "2x"
"scale" : "2x",
"size" : "29x29"
},
{
"idiom" : "ipad",
"size" : "40x40",
"scale" : "1x"
"scale" : "1x",
"size" : "40x40"
},
{
"idiom" : "ipad",
"size" : "40x40",
"scale" : "2x"
"scale" : "2x",
"size" : "40x40"
},
{
"idiom" : "ipad",
"size" : "76x76",
"scale" : "1x"
"scale" : "1x",
"size" : "76x76"
},
{
"idiom" : "ipad",
"size" : "76x76",
"scale" : "2x"
"scale" : "2x",
"size" : "76x76"
},
{
"idiom" : "ipad",
"size" : "83.5x83.5",
"scale" : "2x"
"scale" : "2x",
"size" : "83.5x83.5"
},
{
"idiom" : "ios-marketing",
"size" : "1024x1024",
"scale" : "1x"
"scale" : "1x",
"size" : "1024x1024"
},
{
"idiom" : "mac",
"scale" : "2x",
"size" : "512x512"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
"author" : "xcode",
"version" : 1
}
}
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Estes iconos son de Situm? O ser un repo público tería coidado co icono de app que se sube

9 changes: 5 additions & 4 deletions Example/SitumWayfinding/WayfindingController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ class WayfindingController: UIViewController {
var action: WYFAction?
var credentials: Credentials!
var buildingId: String!
var useRemoteConfig: Bool = false
var useRemoteConfig: Bool = true
var useDashboardTheme: Bool = true

var library: SitumMapsLibrary?
Expand All @@ -32,9 +32,10 @@ class WayfindingController: UIViewController {
let settings = LibrarySettings.Builder()
.setCredentials(credentials: credentials)
.setBuildingId(buildingId: buildingId)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Non comentaria estes set, polo de antes, é unha app de exemplo e a xente podelle interesar ver como se establecen eses valores

.setUseRemoteConfig(useRemoteConfig: useRemoteConfig)
.setEnablePoiClustering(enablePoisClustering: true)
.setUseDashboardTheme(useDashboardTheme: useDashboardTheme)
// .setUseRemoteConfig(useRemoteConfig: useRemoteConfig)
// .setEnablePoiClustering(enablePoisClustering: true)
// .setUseDashboardTheme(useDashboardTheme: useDashboardTheme)
// .setShowPoiNames(showPoiNames: showPoiNames)
.build()
self.library = SitumMapsLibrary(containedBy: self.containerView, controlledBy: self, withSettings: settings)

Expand Down
2 changes: 1 addition & 1 deletion SitumWayfinding.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ Pod::Spec.new do |s|
}

s.dependency 'GoogleMaps', '~> 4.2.0'
s.dependency 'SitumSDK', '~> 2.57.1'
s.dependency 'SitumSDK', '~> 2.58.0'
s.dependency 'Google-Maps-iOS-Utils', '~> 4.1.0'

end
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@ import GoogleMaps
/// Text that will be used as placeholder in the search view component.
private(set) var searchViewPlaceholder: String? = ""
/// Boolean to configure if location system should use the remote configuration (true) or not (false). See https://situm.com/docs/07-remote-configuration/ to learn more on how to use this functionality.
private (set) var useRemoteConfig: Bool = false
private (set) var useRemoteConfig: Bool = true

/// Boolean that configure if the name of the POIs is shown above its icons when painting them on the map
private (set) var showPoiNames: Bool? = false
private (set) var showPoiNames: Bool? = true

/// Boolean that hides the pois finder in the navbar
private (set) var showSearchBar: Bool? = true
Expand All @@ -42,7 +42,7 @@ import GoogleMaps
private (set) var showBackButton: Bool? = false

/// Boolean that controls if the navigation indications are shown or hidden
private (set) var enablePoisClustering: Bool = false
private (set) var enablePoisClustering: Bool = true

/// Boolean to show or hide navigation indications
private (set) var showNavigationIndications: Bool = true
Expand Down