Skip to content

Commit c7e6628

Browse files
committed
Fix widgets after refactoring build configurations
1 parent 4fc9ac7 commit c7e6628

7 files changed

Lines changed: 16 additions & 6 deletions

File tree

UnstoppableWallet/UnstoppableWallet.xcodeproj/project.pbxproj

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1847,6 +1847,8 @@
18471847
D33D6B1F2F98F5BF00E16ADA /* WidgetExtension.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = D33D63A22F98DD5D00E16ADA /* WidgetExtension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
18481848
D33D6B222F98F5C900E16ADA /* IntentExtension.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = D33D63B32F98DD6A00E16ADA /* IntentExtension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
18491849
D35C2EA92F9A164400D186CF /* AppFlavor.swift in Sources */ = {isa = PBXBuildFile; fileRef = D35C2EA82F9A163F00D186CF /* AppFlavor.swift */; };
1850+
D35C2EAB2F9A2BB200D186CF /* AppFlavor.swift in Sources */ = {isa = PBXBuildFile; fileRef = D35C2EA82F9A163F00D186CF /* AppFlavor.swift */; };
1851+
D35C2EAC2F9A2C2F00D186CF /* AppFlavor.swift in Sources */ = {isa = PBXBuildFile; fileRef = D35C2EA82F9A163F00D186CF /* AppFlavor.swift */; };
18501852
/* End PBXBuildFile section */
18511853

18521854
/* Begin PBXContainerItemProxy section */
@@ -8553,6 +8555,7 @@
85538555
D33D634B2F98DD5D00E16ADA /* SingleCoinPriceProvider.swift in Sources */,
85548556
D33D634C2F98DD5D00E16ADA /* Currency.swift in Sources */,
85558557
D33D634D2F98DD5D00E16ADA /* StackComponent.swift in Sources */,
8558+
D35C2EAB2F9A2BB200D186CF /* AppFlavor.swift in Sources */,
85568559
D33D634E2F98DD5D00E16ADA /* CurrencyManager.swift in Sources */,
85578560
D33D634F2F98DD5D00E16ADA /* SharedLocalStorage.swift in Sources */,
85588561
D33D63502F98DD5D00E16ADA /* TappablePadding.swift in Sources */,
@@ -8626,6 +8629,7 @@
86268629
isa = PBXSourcesBuildPhase;
86278630
buildActionMask = 2147483647;
86288631
files = (
8632+
D35C2EAC2F9A2C2F00D186CF /* AppFlavor.swift in Sources */,
86298633
D33D63A82F98DD6A00E16ADA /* IntentHandler.swift in Sources */,
86308634
D33D63A92F98DD6A00E16ADA /* ApiProvider.swift in Sources */,
86318635
D33D63AA2F98DD6A00E16ADA /* AppWidget.intentdefinition in Sources */,

UnstoppableWallet/UnstoppableWallet/Configuration/Widget-Dev.xcconfig

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
#include "Config.xcconfig"
2+
13
PRODUCT_BUNDLE_IDENTIFIER = io.horizontalsystems.bank-wallet.dev.widget
24
CODE_SIGN_ENTITLEMENTS = UnstoppableWallet/Configuration/WidgetDev.entitlements
35
PROVISIONING_PROFILE_SPECIFIER[config=Debug-Dev] = match Development io.horizontalsystems.bank-wallet.dev.widget

UnstoppableWallet/UnstoppableWallet/Configuration/Widget-Prod.xcconfig

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
#include "Config.xcconfig"
2+
13
PRODUCT_BUNDLE_IDENTIFIER = io.horizontalsystems.bank-wallet.widget
24
CODE_SIGN_ENTITLEMENTS = UnstoppableWallet/Configuration/WidgetProd.entitlements
35
PROVISIONING_PROFILE_SPECIFIER[config=Debug-Prod] = match Development io.horizontalsystems.bank-wallet.widget

UnstoppableWallet/Widget/CoinListView.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ struct CoinListView: View {
7272
@ViewBuilder private func list(verticalPadding: CGFloat, rowBuilder: @escaping (CoinItem) -> some View) -> some View {
7373
GeometryReader { proxy in
7474
ListSection {
75-
ForEach(items, id: \.uid) { item in
75+
ForEach(items) { item in
7676
Link(destination: URL(string: "unstoppable.money://coin/\(item.uid)")!) {
7777
rowBuilder(item)
7878
.padding(.horizontal, .margin16)

UnstoppableWallet/Widget/CoinPriceList/CoinPriceListEntry.swift

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ struct CoinPriceListEntry: TimelineEntry {
99
let items: [CoinItem]
1010
}
1111

12-
struct CoinItem {
12+
struct CoinItem: Identifiable {
1313
let uid: String
1414
let icon: Image?
1515
let code: String
@@ -19,6 +19,10 @@ struct CoinItem {
1919
let priceChange: String
2020
let priceChangeType: PriceChangeType
2121

22+
var id: String {
23+
uid
24+
}
25+
2226
static func stub(index: Int) -> CoinItem {
2327
CoinItem(
2428
uid: "coin\(index)",

UnstoppableWallet/Widget/Info.plist

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,7 @@
33
<plist version="1.0">
44
<dict>
55
<key>HsProviderApiKey</key>
6-
<string>$(hs_provider_api_key)</string>
7-
<key>MarketApiUrl</key>
8-
<string>${market_api_url}</string>
6+
<string>$(HS_PROVIDER_API_KEY)</string>
97
<key>NSExtension</key>
108
<dict>
119
<key>NSExtensionPointIdentifier</key>

UnstoppableWallet/Widget/Misc/WidgetConfig.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import UIKit
33

44
enum WidgetConfig {
55
static var marketApiUrl: String {
6-
(Bundle.main.object(forInfoDictionaryKey: "MarketApiUrl") as? String) ?? ""
6+
AppFlavor.config.marketApiUrl
77
}
88

99
static var hsProviderApiKey: String? {

0 commit comments

Comments
 (0)