Skip to content

Commit

Permalink
Fix review feedbacks
Browse files Browse the repository at this point in the history
  • Loading branch information
benjamintios committed Jun 16, 2023
1 parent e0b5d69 commit 59b4874
Show file tree
Hide file tree
Showing 18 changed files with 62 additions and 29 deletions.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"info" : {
"version" : 1,
"author" : "xcode"
"author" : "xcode",
"version" : 1
}
}
}
Original file line number Diff line number Diff line change
@@ -1,26 +1,21 @@
{
"images" : [
{
"filename" : "Icon_1024x1024_1_3_2-removebg-preview.png",
"idiom" : "universal",
"filename" : "GuideDogs_logo 3.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "GuideDogs_logo 2.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "GuideDogs_logo-1.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
},
"properties" : {
"template-rendering-intent" : "template"
"author" : "xcode",
"version" : 1
}
}
}
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"images" : [
{
"filename" : "Icon_1024x1024 1 2.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "Icon_1024x1024 1 [email protected]",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "Icon_1024x1024 1 [email protected]",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
},
"properties" : {
"template-rendering-intent" : "template"
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 5 additions & 5 deletions apps/ios/GuideDogs/Code/App/AppContext.swift
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ class AppContext {
static let appDisplayName = "Soundscape"
static let appVersion = Bundle.main.object(forInfoDictionaryKey: "CFBundleShortVersionString") as! String
static let appBuild = Bundle.main.object(forInfoDictionaryKey: kCFBundleVersionKey as String) as! String
static let appStoreId = "1240320677"
static let appStoreId = "6449701760"

static var appState: UIApplication.State = .inactive
static let appLaunchedInBackground: Bool = UIApplication.shared.applicationState == .background
Expand Down Expand Up @@ -376,16 +376,16 @@ extension AppContext {

struct Links {
static func privacyPolicyURL(for locale: Locale) -> URL {
return URL(string: "INSERT PRIVACY POLICY URL HERE")!
return URL(string: "https://ialabs.ie/privacy-policy")!
}

static func servicesAgreementURL(for locale: Locale) -> URL {
return URL(string: "INSERT SERVICES AGREEMENT URL HERE")!
return URL(string: "https://ialabs.ie/privacy-policy")!
}

static let companySupportURL = URL(string: "INSERT SUPPORT URL HERE")!
static let companySupportURL = URL(string: "https://ialabs.ie/")!

static let accessibilityFrance = URL(string: "INSERT ACCESSIBILITY STATEMENT URL HERE")!
static let accessibilityFrance = URL(string: "https://ialabs.ie/")!
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -505,7 +505,7 @@ class AuthoredActivityLoader {

for (wptIndex, waypoint) in content.waypoints.enumerated() {
for (clipIndex, image) in waypoint.images.enumerated() {
guard let key = manager.cacheKey(for: image.url), let imageCached = await manager.imageCache.containsImage?(forKey: key, cacheType: .all), imageCached == .none else {
guard let key = manager.cacheKey(for: image.url), await manager.imageCache.containsImage!(forKey: key, cacheType: .all) == .none else {
GDLogInfo(.authoredContent, "Image \(image.url.lastPathComponent) already cached (waypoint: \(wptIndex), clip: \(clipIndex))")
continue
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ enum ServiceError: Error {

class OSMServiceModel: OSMServiceModelProtocol {
/// Path to the tile server
private static let path = "/tiles"
private static let path = "/"

func getTileDataWithQueue(tile: VectorTile, categories: SuperCategories, queue: DispatchQueue, callback: @escaping OSMServiceModelProtocol.TileDataLookupCallback) {
let url = URL(string: "\(ServiceModel.servicesHostName)\(OSMServiceModel.path)/\(tile.zoom)/\(tile.x)/\(tile.y).json")!
let url = URL(string: "\(ServiceModel.servicesHostName)\(OSMServiceModel.path)/\(tile.zoom)/\(tile.x)/\(tile.y)")!
var request = URLRequest(url: url, cachePolicy: .reloadIgnoringLocalCacheData, timeoutInterval: ServiceModel.requestTimeout)

// Set the etag header
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,12 +66,12 @@ class MenuViewController: UIViewController {

override func loadView() {
// Build views for menu items
menuView.addMenuItem(.recreation)
//menuView.addMenuItem(.recreation)
menuView.addMenuItem(.devices)
menuView.addMenuItem(.settings)
menuView.addMenuItem(.help)
menuView.addMenuItem(.learningResources)
menuView.addMenuItem(.feedback)
//menuView.addMenuItem(.learningResources)
// menuView.addMenuItem(.feedback)
menuView.addMenuItem(.rate)
menuView.addMenuItem(.share)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ class DynamicLaunchViewController: UIViewController {
}

if !testEnvironment, !UIDeviceManager.isSimulator {
AppCenter.start(withAppSecret: "<#Secret#>", services: [Analytics.self, Crashes.self])
AppCenter.start(withAppSecret: "Secret", services: [Analytics.self, Crashes.self])
Analytics.enabled = !SettingsContext.shared.telemetryOptout
Crashes.enabled = !SettingsContext.shared.telemetryOptout
}
Expand Down
15 changes: 13 additions & 2 deletions apps/ios/GuideDogs/Code/Visual UI/Views/FirstLaunch.storyboard
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="21701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="SKe-a6-Z8X">
<device id="retina4_7" orientation="portrait" appearance="light"/>
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21678"/>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21679"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<scenes>
Expand Down Expand Up @@ -222,7 +223,6 @@
<navigationController navigationBarHidden="YES" id="SKe-a6-Z8X" sceneMemberID="viewController">
<nil key="simulatedTopBarMetrics"/>
<navigationBar key="navigationBar" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" translucent="NO" id="PQs-yu-UxM">
<rect key="frame" x="0.0" y="0.0" width="1000" height="1000"/>
<autoresizingMask key="autoresizingMask"/>
</navigationBar>
<userDefinedRuntimeAttributes>
Expand Down Expand Up @@ -503,6 +503,17 @@
<point key="canvasLocation" x="-634" y="-260"/>
</scene>
</scenes>
<designables>
<designable name="2i8-rP-UDC">
<size key="intrinsicContentSize" width="30" height="30"/>
</designable>
<designable name="JPX-Dl-x02">
<size key="intrinsicContentSize" width="30" height="30"/>
</designable>
<designable name="pGU-6E-1Jv">
<size key="intrinsicContentSize" width="30" height="30"/>
</designable>
</designables>
<resources>
<image name="ic_check_box_outline_blank_white" width="24" height="24"/>
<image name="permissions-device" width="375" height="172"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="21701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
<device id="retina4_7" orientation="portrait" appearance="light"/>
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21678"/>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21679"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<scenes>
Expand Down Expand Up @@ -61,6 +62,6 @@
</scene>
</scenes>
<resources>
<image name="launchScreenLogo" width="200" height="200"/>
<image name="launchScreenLogo" width="600" height="600"/>
</resources>
</document>
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ struct OnboardingWelcomeView: View {

var body: some View {
NavigationView {
OnboardingContainer(coverImage: Image("permissions-intro"), accessibilityLabel: GDLocalizationUnnecessary("AppName")) {
OnboardingContainer(coverImage: Image("Welcome-destination"), accessibilityLabel: GDLocalizationUnnecessary("AppName")) {
Spacer()

VStack(spacing: 12.0) {
Expand Down

0 comments on commit 59b4874

Please sign in to comment.