Skip to content

Commit b0403d9

Browse files
cursoragentdecoder-dev
cursoragent
and
decoder-dev
committed
iMessage unified nav: legacy+hideBackground across all screens (ItemList, ViewControllerComponent, CallList, Settings, Browser, BotPayments, etc.)
Co-authored-by: D3C0Y <decoder-dev@users.noreply.github.com>
1 parent 41821d8 commit b0403d9

20 files changed

Lines changed: 48 additions & 48 deletions

File tree

‎submodules/BotPaymentsUI/Sources/BotCheckoutController.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,10 +141,10 @@ public final class BotCheckoutController: ViewController {
141141

142142
self.presentationData = context.sharedContext.currentPresentationData.with { $0 }
143143

144-
super.init(navigationBarPresentationData: NavigationBarPresentationData(presentationData: self.presentationData, style: .glass))
144+
super.init(navigationBarPresentationData: NavigationBarPresentationData(presentationData: self.presentationData, hideBackground: true, hideBadge: false, hideSeparator: true, style: .legacy))
145145

146146
self.statusBar.statusBarStyle = self.presentationData.theme.rootController.statusBarStyle.style
147-
self._hasGlassStyle = true
147+
self._hasGlassStyle = false
148148

149149
var title = self.presentationData.strings.Checkout_Title
150150
if invoice.flags.contains(.isTest) {

‎submodules/BotPaymentsUI/Sources/BotCheckoutInfoController.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,9 @@ final class BotCheckoutInfoController: ViewController {
6060

6161
self.presentationData = context.sharedContext.currentPresentationData.with { $0 }
6262

63-
super.init(navigationBarPresentationData: NavigationBarPresentationData(presentationData: self.presentationData, style: .glass))
63+
super.init(navigationBarPresentationData: NavigationBarPresentationData(presentationData: self.presentationData, hideBackground: true, hideBadge: false, hideSeparator: true, style: .legacy))
6464

65-
self._hasGlassStyle = true
65+
self._hasGlassStyle = false
6666
self.statusBar.statusBarStyle = self.presentationData.theme.rootController.statusBarStyle.style
6767

6868
self.doneItem = UIBarButtonItem(title: "___done", style: .done, target: self, action: #selector(self.donePressed))

‎submodules/BotPaymentsUI/Sources/BotCheckoutNativeCardEntryController.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,9 @@ final class BotCheckoutNativeCardEntryController: ViewController {
5555

5656
self.presentationData = context.sharedContext.currentPresentationData.with { $0 }
5757

58-
super.init(navigationBarPresentationData: NavigationBarPresentationData(presentationData: self.presentationData, style: .glass))
58+
super.init(navigationBarPresentationData: NavigationBarPresentationData(presentationData: self.presentationData, hideBackground: true, hideBadge: false, hideSeparator: true, style: .legacy))
5959

60-
self._hasGlassStyle = true
60+
self._hasGlassStyle = false
6161
self.statusBar.statusBarStyle = self.presentationData.theme.rootController.statusBarStyle.style
6262

6363
self.doneItem = UIBarButtonItem(title: "___done", style: .done, target: self, action: #selector(self.donePressed))

‎submodules/BrowserUI/Sources/BrowserBookmarksScreen.swift‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -392,9 +392,9 @@ public final class BrowserBookmarksScreen: ViewController {
392392
self.openUrl = openUrl
393393
self.addBookmark = addBookmark
394394

395-
super.init(navigationBarPresentationData: NavigationBarPresentationData(presentationData: self.presentationData, style: .glass))
395+
super.init(navigationBarPresentationData: NavigationBarPresentationData(presentationData: self.presentationData, hideBackground: true, hideBadge: false, hideSeparator: true, style: .legacy))
396396

397-
self._hasGlassStyle = true
397+
self._hasGlassStyle = false
398398

399399
self.navigationPresentation = .modal
400400
self.supportedOrientations = ViewControllerSupportedOrientations(regularSize: .all, compactSize: .portrait)
@@ -457,7 +457,7 @@ public final class BrowserBookmarksScreen: ViewController {
457457

458458
private func updateThemeAndStrings() {
459459
self.statusBar.statusBarStyle = self.presentationData.theme.rootController.statusBarStyle.style
460-
self.navigationBar?.updatePresentationData(NavigationBarPresentationData(presentationData: self.presentationData, style: .glass), transition: .immediate)
460+
self.navigationBar?.updatePresentationData(NavigationBarPresentationData(presentationData: self.presentationData, hideBackground: true, hideBadge: false, hideSeparator: true, style: .legacy), transition: .immediate)
461461
self.searchContentNode?.updateThemeAndPlaceholder(theme: self.presentationData.theme, placeholder: self.presentationData.strings.Common_Search)
462462
}
463463

‎submodules/CallListUI/Sources/CallListController.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ public final class CallListController: TelegramBaseController {
126126

127127
self.segmentedTitleView = ItemListControllerSegmentedTitleView(theme: self.presentationData.theme, segments: [self.presentationData.strings.Calls_All, self.presentationData.strings.Calls_Missed], selectedIndex: 0)
128128

129-
super.init(context: context, navigationBarPresentationData: NavigationBarPresentationData(presentationData: self.presentationData, style: .glass))
129+
super.init(context: context, navigationBarPresentationData: NavigationBarPresentationData(presentationData: self.presentationData, hideBackground: true, hideBadge: false, hideSeparator: true, style: .legacy))
130130

131131
self.tabBarItemContextActionType = .always
132132

@@ -229,7 +229,7 @@ public final class CallListController: TelegramBaseController {
229229
}
230230

231231
self.statusBar.statusBarStyle = self.presentationData.theme.rootController.statusBarStyle.style
232-
self.navigationBar?.updatePresentationData(NavigationBarPresentationData(presentationData: self.presentationData, style: .glass), transition: .immediate)
232+
self.navigationBar?.updatePresentationData(NavigationBarPresentationData(presentationData: self.presentationData, hideBackground: true, hideBadge: false, hideSeparator: true, style: .legacy), transition: .immediate)
233233

234234
if self.isNodeLoaded {
235235
self.controllerNode.updateThemeAndStrings(presentationData: self.presentationData)

‎submodules/Components/ViewControllerComponent/Sources/ViewControllerComponent.swift‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -288,13 +288,13 @@ open class ViewControllerComponentContainer: ViewController {
288288
case .none:
289289
navigationBarPresentationData = nil
290290
case .transparent:
291-
navigationBarPresentationData = NavigationBarPresentationData(presentationData: presentationData, hideBackground: true, hideBadge: false, hideSeparator: true, style: .glass)
291+
navigationBarPresentationData = NavigationBarPresentationData(presentationData: presentationData, hideBackground: true, hideBadge: false, hideSeparator: true, style: .legacy)
292292
case .default:
293-
navigationBarPresentationData = NavigationBarPresentationData(presentationData: presentationData, hideBackground: false, hideBadge: false, hideSeparator: true, style: .glass, edgeEffectColor: self.baseNavigationColors == .blocks ? self.presentationData.theme.list.itemBlocksBackgroundColor : nil)
293+
navigationBarPresentationData = NavigationBarPresentationData(presentationData: presentationData, hideBackground: true, hideBadge: false, hideSeparator: true, style: .legacy)
294294
}
295295
super.init(navigationBarPresentationData: navigationBarPresentationData)
296296

297-
self._hasGlassStyle = true
297+
self._hasGlassStyle = false
298298

299299
self.setupPresentationData(effectiveUpdatedPresentationData, navigationBarAppearance: navigationBarAppearance, statusBarStyle: statusBarStyle, presentationMode: presentationMode)
300300
}
@@ -320,9 +320,9 @@ open class ViewControllerComponentContainer: ViewController {
320320
case .none:
321321
navigationBarPresentationData = nil
322322
case .transparent:
323-
navigationBarPresentationData = NavigationBarPresentationData(presentationData: presentationData, hideBackground: true, hideBadge: false, hideSeparator: true, style: .glass)
323+
navigationBarPresentationData = NavigationBarPresentationData(presentationData: presentationData, hideBackground: true, hideBadge: false, hideSeparator: true, style: .legacy)
324324
case .default:
325-
navigationBarPresentationData = NavigationBarPresentationData(presentationData: presentationData, hideBackground: false, hideBadge: false, hideSeparator: true, style: .glass, edgeEffectColor: self.baseNavigationColors == .blocks ? self.presentationData.theme.list.itemBlocksBackgroundColor : nil)
325+
navigationBarPresentationData = NavigationBarPresentationData(presentationData: presentationData, hideBackground: true, hideBadge: false, hideSeparator: true, style: .legacy)
326326
}
327327
super.init(navigationBarPresentationData: navigationBarPresentationData)
328328

@@ -368,9 +368,9 @@ open class ViewControllerComponentContainer: ViewController {
368368
case .none:
369369
navigationBarPresentationData = nil
370370
case .transparent:
371-
navigationBarPresentationData = NavigationBarPresentationData(presentationData: presentationData, hideBackground: true, hideBadge: false, hideSeparator: true, style: .glass)
371+
navigationBarPresentationData = NavigationBarPresentationData(presentationData: presentationData, hideBackground: true, hideBadge: false, hideSeparator: true, style: .legacy)
372372
case .default:
373-
navigationBarPresentationData = NavigationBarPresentationData(presentationData: presentationData, hideBackground: false, hideBadge: false, hideSeparator: true, style: .glass, edgeEffectColor: strongSelf.baseNavigationColors == .blocks ? strongSelf.presentationData.theme.list.itemBlocksBackgroundColor : nil)
373+
navigationBarPresentationData = NavigationBarPresentationData(presentationData: presentationData, hideBackground: true, hideBadge: false, hideSeparator: true, style: .legacy)
374374
}
375375
if let navigationBarPresentationData {
376376
strongSelf.navigationBar?.updatePresentationData(navigationBarPresentationData, transition: .immediate)

‎submodules/ItemListUI/Sources/ItemListController.swift‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -283,12 +283,12 @@ open class ItemListController: ViewController, KeyShortcutResponder, Presentable
283283
self.presentationData = presentationData
284284
self.hideNavigationBarBackground = hideNavigationBarBackground
285285

286-
super.init(navigationBarPresentationData: NavigationBarPresentationData(theme: NavigationBarTheme(rootControllerTheme: presentationData.theme, hideBackground: hideNavigationBarBackground, hideSeparator: hideNavigationBarBackground, style: .glass), strings: NavigationBarStrings(presentationStrings: presentationData.strings)))
286+
super.init(navigationBarPresentationData: NavigationBarPresentationData(theme: NavigationBarTheme(rootControllerTheme: presentationData.theme, hideBackground: true, hideSeparator: true, style: .legacy), strings: NavigationBarStrings(presentationStrings: presentationData.strings)))
287287

288288
self.isOpaqueWhenInOverlay = true
289289
self.blocksBackgroundWhenInOverlay = true
290290
self.automaticallyControlPresentationContextLayout = false
291-
self._hasGlassStyle = true
291+
self._hasGlassStyle = false
292292

293293
self.statusBar.statusBarStyle = presentationData.theme.rootController.statusBarStyle.style
294294

@@ -557,7 +557,7 @@ open class ItemListController: ViewController, KeyShortcutResponder, Presentable
557557
if strongSelf.presentationData != controllerState.presentationData || isFirstTime {
558558
strongSelf.presentationData = controllerState.presentationData
559559

560-
strongSelf.navigationBar?.updatePresentationData(NavigationBarPresentationData(theme: NavigationBarTheme(rootControllerTheme: strongSelf.presentationData.theme, hideBackground: strongSelf.hideNavigationBarBackground, hideSeparator: strongSelf.hideNavigationBarBackground, edgeEffectColor: state.0.style == .blocks ? strongSelf.presentationData.theme.list.blocksBackgroundColor : strongSelf.presentationData.theme.list.plainBackgroundColor, style: .glass), strings: NavigationBarStrings(presentationStrings: strongSelf.presentationData.strings)), transition: .immediate)
560+
strongSelf.navigationBar?.updatePresentationData(NavigationBarPresentationData(theme: NavigationBarTheme(rootControllerTheme: strongSelf.presentationData.theme, hideBackground: true, hideSeparator: true, style: .legacy), strings: NavigationBarStrings(presentationStrings: strongSelf.presentationData.strings)), transition: .immediate)
561561
strongSelf.statusBar.updateStatusBarStyle(strongSelf.presentationData.theme.rootController.statusBarStyle.style, animated: true)
562562

563563
strongSelf.segmentedTitleView?.theme = controllerState.presentationData.theme

‎submodules/PasscodeUI/Sources/PasscodeSetupController.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public final class PasscodeSetupController: ViewController {
3434
self.mode = mode
3535
self.presentationData = context.sharedContext.currentPresentationData.with { $0 }
3636

37-
super.init(navigationBarPresentationData: NavigationBarPresentationData(presentationData: self.presentationData, style: .glass))
37+
super.init(navigationBarPresentationData: NavigationBarPresentationData(presentationData: self.presentationData, hideBackground: true, hideBadge: false, hideSeparator: true, style: .legacy))
3838

3939
self.supportedOrientations = ViewControllerSupportedOrientations(regularSize: .all, compactSize: .portrait)
4040
self.statusBar.statusBarStyle = self.presentationData.theme.rootController.statusBarStyle.style

‎submodules/PeerInfoUI/Sources/ChannelMembersSearchController.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@ public final class ChannelMembersSearchControllerImpl: ViewController, ChannelMe
4343
self.presentationData = self.presentationData.withUpdated(theme: forceTheme)
4444
}
4545

46-
super.init(navigationBarPresentationData: NavigationBarPresentationData(presentationData: self.presentationData, style: .glass))
46+
super.init(navigationBarPresentationData: NavigationBarPresentationData(presentationData: self.presentationData, hideBackground: true, hideBadge: false, hideSeparator: true, style: .legacy))
4747

48-
self._hasGlassStyle = true
48+
self._hasGlassStyle = false
4949
self.navigationPresentation = .modal
5050

5151
self.statusBar.statusBarStyle = self.presentationData.theme.rootController.statusBarStyle.style

‎submodules/PeerInfoUI/Sources/SecretChatKeyController.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public final class SecretChatKeyController: ViewController {
2424

2525
self.presentationData = context.sharedContext.currentPresentationData.with { $0 }
2626

27-
super.init(navigationBarPresentationData: NavigationBarPresentationData(presentationData: self.presentationData, style: .glass))
27+
super.init(navigationBarPresentationData: NavigationBarPresentationData(presentationData: self.presentationData, hideBackground: true, hideBadge: false, hideSeparator: true, style: .legacy))
2828

2929
self.navigationPresentation = .modal
3030
self._hasGlassStyle = true

0 commit comments

Comments
 (0)