Don't link unused code

This commit is contained in:
Ali
2020-02-01 23:34:19 +04:00
parent 615e2c7e1a
commit 7e4a7df596
23 changed files with 111 additions and 23 deletions

View File

@@ -33,7 +33,9 @@ import PeerAvatarGalleryUI
import MapResourceToAvatarSizes
import AppBundle
import ContextUI
#if ENABLE_WALLET
import WalletUI
#endif
import PhoneNumberFormat
import AccountUtils
import AuthTransferUI
@@ -221,7 +223,9 @@ private indirect enum SettingsEntry: ItemListNodeEntry {
case themes(PresentationTheme, UIImage?, String)
case language(PresentationTheme, UIImage?, String, String)
case passport(PresentationTheme, UIImage?, String, String)
#if ENABLE_WALLET
case wallet(PresentationTheme, UIImage?, String, String)
#endif
case watch(PresentationTheme, UIImage?, String, String)
case askAQuestion(PresentationTheme, UIImage?, String)
@@ -243,8 +247,12 @@ private indirect enum SettingsEntry: ItemListNodeEntry {
return SettingsSection.media.rawValue
case .notificationsAndSounds, .privacyAndSecurity, .dataAndStorage, .themes, .language, .contentStickers:
return SettingsSection.generalSettings.rawValue
case .passport, .wallet, .watch :
case .passport, .watch:
return SettingsSection.advanced.rawValue
#if ENABLE_WALLET
case .wallet:
return SettingsSection.advanced.rawValue
#endif
case .askAQuestion, .faq:
return SettingsSection.help.rawValue
}
@@ -290,8 +298,10 @@ private indirect enum SettingsEntry: ItemListNodeEntry {
return 1012
case .contentStickers:
return 1013
#if ENABLE_WALLET
case .wallet:
return 1014
#endif
case .passport:
return 1015
case .watch:
@@ -457,12 +467,14 @@ private indirect enum SettingsEntry: ItemListNodeEntry {
} else {
return false
}
#if ENABLE_WALLET
case let .wallet(lhsTheme, lhsImage, lhsText, lhsValue):
if case let .wallet(rhsTheme, rhsImage, rhsText, rhsValue) = rhs, lhsTheme === rhsTheme, lhsImage === rhsImage, lhsText == rhsText, lhsValue == rhsValue {
return true
} else {
return false
}
#endif
case let .watch(lhsTheme, lhsImage, lhsText, lhsValue):
if case let .watch(rhsTheme, rhsImage, rhsText, rhsValue) = rhs, lhsTheme === rhsTheme, lhsImage === rhsImage, lhsText == rhsText, lhsValue == rhsValue {
return true
@@ -596,10 +608,12 @@ private indirect enum SettingsEntry: ItemListNodeEntry {
return ItemListDisclosureItem(presentationData: presentationData, icon: image, title: text, label: value, sectionId: ItemListSectionId(self.section), style: .blocks, action: {
arguments.openPassport()
})
#if ENABLE_WALLET
case let .wallet(theme, image, text, value):
return ItemListDisclosureItem(presentationData: presentationData, icon: image, title: text, label: value, sectionId: ItemListSectionId(self.section), style: .blocks, action: {
arguments.openWallet()
})
#endif
case let .watch(theme, image, text, value):
return ItemListDisclosureItem(presentationData: presentationData, icon: image, title: text, label: value, sectionId: ItemListSectionId(self.section), style: .blocks, action: {
arguments.openWatch()
@@ -685,9 +699,11 @@ private func settingsEntries(account: Account, presentationData: PresentationDat
entries.append(.language(presentationData.theme, PresentationResourcesSettings.language, presentationData.strings.Settings_AppLanguage, languageName.isEmpty ? presentationData.strings.Localization_LanguageName : languageName))
entries.append(.contentStickers(presentationData.theme, PresentationResourcesSettings.stickers, presentationData.strings.ChatSettings_Stickers, unreadTrendingStickerPacks == 0 ? "" : "\(unreadTrendingStickerPacks)", archivedPacks))
#if ENABLE_WALLET
if hasWallet {
entries.append(.wallet(presentationData.theme, PresentationResourcesSettings.wallet, "Gram Wallet", ""))
}
#endif
if hasPassport {
entries.append(.passport(presentationData.theme, PresentationResourcesSettings.passport, presentationData.strings.Settings_Passport, ""))
}
@@ -989,6 +1005,7 @@ public func settingsController(context: AccountContext, accountManager: AccountM
pushControllerImpl?(SecureIdAuthController(context: context, mode: .list))
})
}, openWallet: {
#if ENABLE_WALLET
let _ = (contextValue.get()
|> deliverOnMainQueue
|> take(1)).start(next: { context in
@@ -996,6 +1013,7 @@ public func settingsController(context: AccountContext, accountManager: AccountM
pushControllerImpl?(c)
})
})
#endif
}, openWatch: {
let _ = (contextValue.get()
|> deliverOnMainQueue
@@ -1252,11 +1270,14 @@ public func settingsController(context: AccountContext, accountManager: AccountM
}
)
)
#if ENABLE_WALLET
let hasWallet = contextValue.get()
|> mapToSignal { context in
return context.hasWalletAccess
}
#else
let hasWallet: Signal<Bool, NoError> = .single(false)
#endif
let hasPassport = ValuePromise<Bool>(false)
let updatePassport: () -> Void = {