Release 0.2.0

Surcharges/Applications/Project.swift

@@ -73,25 +73,28 @@ let infoPlist: InfoPlist = .extendingDefault(
     "NSLocationWhenInUseUsageDescription": .string("Surcharges uses your location to provide nearest places to you."),
     "NSCameraUsageDescription": .string("Surcharges uses your camera to take your receipt."),
     "ITSAppUsesNonExemptEncryption": .boolean(false),
+    "UISupportedInterfaceOrientations": .array([.string("UIInterfaceOrientationPortrait")])
   ]
 )
 
 // MARK: Target - Prod
 let surcharges = Target.target(
   name: "Surcharges",
-  destinations: [.iPhone, .iPad, .mac],
+  destinations: [.iPhone],
   product: .app,
   bundleId: "nz.surcharges",
-  deploymentTargets: .multiplatform(iOS: "17.0", macOS: "13.0"),
+  deploymentTargets: .iOS("17.0"),
   infoPlist: infoPlist,
   sources: ["Sources/Commons/**", "Sources/Prod/**"],
   resources: .resources(
     [
+      "Resources/Localise/**",
       .glob(
         pattern: .relativeToManifest("Resources/Prod/**"),
         excluding: [.relativeToManifest("Resources/Prod/.gitkeep")]
-      )
-    ], privacyManifest: .default
+      ),
+    ],
+    privacyManifest: .default
   ),
   dependencies: productionDependencies + externalDependencies,
   settings: Settings.settings(
@@ -105,19 +108,21 @@ let surcharges = Target.target(
 // MARK: Target - Dev
 let surchargesDev = Target.target(
   name: "SurchargesDev",
-  destinations: [.iPhone, .iPad, .mac],
+  destinations: [.iPhone],
   product: .app,
   bundleId: "nz.surcharges.development",
-  deploymentTargets: .multiplatform(iOS: "17.0", macOS: "13.0"),
+  deploymentTargets: .iOS("17.0"),
   infoPlist: infoPlist,
   sources: ["Sources/Commons/**", "Sources/Dev/**"],
   resources: .resources(
     [
+      "Resources/Localise/**",
       .glob(
         pattern: .relativeToManifest("Resources/Dev/**"),
         excluding: [.relativeToManifest("Resources/Dev/.gitkeep")]
-      )
-    ], privacyManifest: .default
+      ),
+    ],
+    privacyManifest: .default
   ),
   dependencies: developmentDependencies + externalDependencies,
   settings: Settings.settings(

Surcharges/Applications/Resources/Dev/Images.xcassets/AppIcon.appiconset/Contents.json

@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "appicon.png",
+      "filename" : "AppIcon_light.png",
       "idiom" : "universal",
       "platform" : "ios",
       "size" : "1024x1024"
@@ -13,7 +13,7 @@
           "value" : "dark"
         }
       ],
-      "filename" : "appicon 1.png",
+      "filename" : "AppIcon_dark.png",
       "idiom" : "universal",
       "platform" : "ios",
       "size" : "1024x1024"
@@ -25,7 +25,7 @@
           "value" : "tinted"
         }
       ],
-      "filename" : "appicon 2.png",
+      "filename" : "AppIcon_light 1.png",
       "idiom" : "universal",
       "platform" : "ios",
       "size" : "1024x1024"

Surcharges/Applications/Resources/Localise/en.lproj/InfoPlist.strings

@@ -0,0 +1,10 @@
+/*
+ InfoPlist.strings
+ Resources
+
+ Created by Bonsung Koo on 30/01/2025.
+ Copyright © 2025 Surcharges. All rights reserved.
+ */
+
+"NSCameraUsageDescription"= "Surcharges uses your camera to take your receipt.";
+"NSLocationWhenInUseUsageDescription"= "Surcharges uses your location to provide nearest places to you.";

Surcharges/Applications/Resources/Localise/en.lproj/Localizable.strings

@@ -0,0 +1,9 @@
+/*
+ Localizable.strings
+ Resources
+
+ Created by Bonsung Koo on 30/01/2025.
+ Copyright © 2025 Surcharges. All rights reserved.
+ */
+
+/* This file must be empty. */

Surcharges/Applications/Resources/Localise/ko.lproj/InfoPlist.strings

@@ -0,0 +1,10 @@
+/*
+ InfoPlist.strings
+ Resources
+
+ Created by Bonsung Koo on 30/01/2025.
+ Copyright © 2025 Surcharges. All rights reserved.
+ */
+
+"NSCameraUsageDescription"= "영수증 사진을 촬영하기 위해 카메라를 사용합니다.";
+"NSLocationWhenInUseUsageDescription"= "당신 주변의 상점을 검색하기 위해 위치 정보를 사용합니다.";

Surcharges/Applications/Resources/Localise/ko.lproj/Localizable.strings

@@ -0,0 +1,9 @@
+/* 
+ Localizable.strings
+ Resources
+
+ Created by Bonsung Koo on 30/01/2025.
+ Copyright © 2025 Surcharges. All rights reserved.
+ */
+
+/* This file must be empty. */

Surcharges/Applications/Resources/Prod/Images.xcassets/AppIcon.appiconset/Contents.json

@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "appicon.png",
+      "filename" : "AppIcon_light.png",
       "idiom" : "universal",
       "platform" : "ios",
       "size" : "1024x1024"
@@ -13,7 +13,7 @@
           "value" : "dark"
         }
       ],
-      "filename" : "appicon 1.png",
+      "filename" : "AppIcon_dark.png",
       "idiom" : "universal",
       "platform" : "ios",
       "size" : "1024x1024"
@@ -25,7 +25,7 @@
           "value" : "tinted"
         }
       ],
-      "filename" : "appicon 2.png",
+      "filename" : "AppIcon_light 1.png",
       "idiom" : "universal",
       "platform" : "ios",
       "size" : "1024x1024"

Surcharges/DataLayer/Networks/Sources/API/Response.swift

@@ -71,7 +71,7 @@ extension API {
 		case .badRequest:
 			throw .badRequest
 		case .forbidden:
-			throw .forbidden
+			throw .forbidden(reason: .region(availableRegions: ["nz"]))
 		case .unauthorised:
 			throw .unauthorised
 		case .notFound:

Surcharges/DataLayer/Networks/Sources/Commons/NetworkError.swift

@@ -9,10 +9,22 @@
 import Foundation
 
 public enum NetworkError: Error {
+
+	public enum ForbiddenReason: Identifiable, Equatable, Sendable {
+		case region(availableRegions: [String])
+
+		public var id: String {
+			switch self {
+			case .region(let availableRegions):
+				return availableRegions.joined(separator: "")
+			}
+		}
+	}
+
 	case systemError
 	case badRequest
 	case unauthorised
-	case forbidden
+	case forbidden(reason: ForbiddenReason)
 	case notFound
 	case methodNotAllowed
 	case deprecatedAPI

Surcharges/DataLayer/Repositories/Sources/errorHandler.swift

@@ -17,8 +17,11 @@ extension RepositoryProtocol {
 		switch error {
 		case .unauthorised:
 			await appStatusService.notifyAppStatus(.toast(.unauthorised))
-		case .forbidden:
-			await appStatusService.notifyAppStatus(.toast(.outOfNZ))
+		case .forbidden(let reason):
+			switch reason {
+			case .region(let availableRegions):
+				await appStatusService.notifyAppStatus(.toast(.outOfRegion(availableRegions: availableRegions)))
+			}
 		case .systemError:
 			await appStatusService.notifyAppStatus(.toast(.noInternet))
 		case .deprecatedAPI:

Surcharges/PresentationLayer/UIs/Main/Sources/MainView.swift

@@ -45,6 +45,8 @@ public struct MainView<VM: MainViewModelProtocol, Router: MainRouterProtocol>: V
 					.padding([.top], 10)
 					.padding([.leading, .trailing], 20)
 
+					/*
+					 // Favourite Places is currently not available.
 					Section {
 
 						FavouritePlacesView()
@@ -55,6 +57,7 @@ public struct MainView<VM: MainViewModelProtocol, Router: MainRouterProtocol>: V
 							.font(.title3)
 							.blurBackground()
 					}
+					 */
 
 					if _viewModel.isLoading {
 
@@ -90,7 +93,7 @@ public struct MainView<VM: MainViewModelProtocol, Router: MainRouterProtocol>: V
 									)
 
 								} header: {
-									Text("Search for \"\(_viewModel.searchedText)\"")
+									Text(R.string.localizable.searchFor(_viewModel.searchedText))
 										.font(.title3)
 										.blurBackground()
 								}
@@ -138,7 +141,7 @@ public struct MainView<VM: MainViewModelProtocol, Router: MainRouterProtocol>: V
 				.buttonStyle(.plain)
 				.contentTransition(.symbolEffect(.replace))
 				.alert(
-					"Use Location is Denied",
+					R.string.localizable.alertUseLocationDeniedTitle(),
 					isPresented: $_showLocationDeniedAlert
 				) {
 
@@ -147,17 +150,17 @@ public struct MainView<VM: MainViewModelProtocol, Router: MainRouterProtocol>: V
 						UIApplication.shared.open(URL(string: UIApplication.openSettingsURLString)!, options: [:], completionHandler: nil)
 
 					} label: {
-						Text("Go to Settings")
+						Text(R.string.localizable.goToSettings())
 					}
 
 					Button(role: .cancel) {
 						_showLocationDeniedAlert.toggle()
 					} label: {
-						Text("Close")
+						Text(R.string.localizable.close())
 					}
 
 				} message: {
-					Text("Allow to use your location")
+					Text(R.string.localizable.alertUseLocationDeniedMessage())
 				}
 				.popoverTip(_useLocationTip, arrowEdge: .leading) { action in
 					withAnimation {
@@ -166,7 +169,7 @@ public struct MainView<VM: MainViewModelProtocol, Router: MainRouterProtocol>: V
 					_useLocationTip.invalidate(reason: .actionPerformed)
 				}
 
-				TextField("Search your destination", text: $_viewModel.searchText)
+				TextField(R.string.localizable.searchBoxPlaceholder(), text: $_viewModel.searchText)
 					.textFieldStyle(.roundedBorder)
 					.font(.body)
 					.disabled(_viewModel.isLoading)
@@ -188,7 +191,7 @@ public struct MainView<VM: MainViewModelProtocol, Router: MainRouterProtocol>: V
 						await _viewModel.search()
 					}
 				} label: {
-					Text("Search")
+					Text(R.string.localizable.searchButtonTitle())
 						.font(.body)
 						.disabled(!_viewModel.canSearch)
 				}

Surcharges/PresentationLayer/UIs/Main/Sources/SearchResult/NoResultView.swift

@@ -30,7 +30,7 @@ struct NoResultView: View {
 					.font(.largeTitle)
 			}
 
-			Text("Oops!\nNo results found for \"\(_searchedText)\"")
+			Text(R.string.localizable.noResultForSearch(_searchedText))
 				.font(.subheadline)
 				.multilineTextAlignment(.center)
 

Surcharges/PresentationLayer/UIs/Main/Sources/SearchResult/PlaceView.swift

@@ -32,11 +32,11 @@ struct PlaceView: View {
 
 				if let rate = _place.surcharge.rate {
 					if _place.surcharge.status == .reported {
-						Text(verbatim: rate == 0 ? "Zero🎉" : "\(rate)%")
+						Text(verbatim: rate == 0 ? "\(R.string.localizable.zeroRates())🎉" : "\(rate)%")
 							.surchargeStatusReported()
 
 					} else if _place.surcharge.status == .confirmed {
-						Text(verbatim: rate == 0 ? "Zero🎉" : "\(rate)%")
+						Text(verbatim: rate == 0 ? "\(R.string.localizable.zeroRates())🎉" : "\(rate)%")
 							.surchargeStatusConfirmed()
 					}
 				}

Surcharges/PresentationLayer/UIs/Main/Sources/Tip/SurchargeStatusTip.swift

@@ -9,15 +9,16 @@
 import SwiftUI
 import TipKit
 
+import Resources
 import CommonUI
 
 struct SurchargeStatusTip: Tip {
 	var title: Text {
-		Text("Surcharge Status")
+		Text(R.string.localizable.tipSurchargeStatusTitle())
 	}
 
 	var message: Text? {
-		Text("Get to know different surcharge status")
+		Text(R.string.localizable.tipSurchargeStatusMessage())
 	}
 
 	var image: Image? {

Surcharges/PresentationLayer/UIs/Main/Sources/Tip/UseLocationTip.swift

@@ -9,13 +9,15 @@
 import SwiftUI
 import TipKit
 
+import Resources
+
 struct UseLocationTip: Tip {
 	var title: Text {
-		Text("Use Your Location")
+		Text(R.string.localizable.tipUseLocationTitle())
 	}
 
 	var message: Text? {
-		Text("Search for nearby places.")
+		Text(R.string.localizable.tipUseLocationMessage())
 	}
 
 	var image: Image? {

Surcharges/PresentationLayer/UIs/Main/Sources/Welcome/WelcomeView.swift

@@ -8,9 +8,11 @@
 
 import SwiftUI
 
+import Resources
+
 struct WelcomeView: View {
 
 	var body: some View {
-		Text("Welcome to the Surcharge App")
+		Text(R.string.localizable.welcomeToSurchargeApp())
 	}
 }

Surcharges/PresentationLayer/UIs/PlaceDetail/Sources/Button/ContributeButton.swift

@@ -8,6 +8,7 @@
 
 import SwiftUI
 
+import Resources
 import Models
 
 struct ContributeButton: View {
@@ -45,9 +46,9 @@ struct ContributeButton: View {
 
 		switch _surcharge.status {
 		case .notDetermined: return ""
-		case .unknown: return "We're welcome to your contribution🙏🏻"
+		case .unknown: return "\(R.string.localizable.reportForUnknownButtonTitle())🙏🏻"
 		case .reported: return ""
-		case .confirmed: return "Something wrong?🤔"
+		case .confirmed: return "\(R.string.localizable.reportForConfirmedButtonTitle())🤔"
 		}
 	}
 }