ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-12-24 07:05:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Wide Tab bar

Browse Source
This commit is contained in:
Kylmakalle
2025-12-22 00:06:14 +02:00
parent 57634e545f
commit 61ef315407
4 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Swiftgram/SGSettingsUI/Sources/SGSettingsController.swift
View File

@@ -50,6 +50,7 @@ private enum SGBoolSetting: String {
case showTabNames
case showContactsTab
case showCallsTab
case wideTabBar
case foldersAtBottom
case startTelescopeWithRearCam
case hideStories
@@ -166,6 +167,8 @@ private func SGControllerEntries(presentationData: PresentationData, callListSet
entries.append(.toggle(id: id.count, section: .tabs, settingName: .showContactsTab, value: callListSettings.showContactsTab, text: i18n("Settings.Tabs.ShowContacts", lang), enabled: !SGSimpleSettings.shared.hideTabBar))
entries.append(.toggle(id: id.count, section: .tabs, settingName: .showCallsTab, value: callListSettings.showTab, text: strings.CallSettings_TabIcon, enabled: !SGSimpleSettings.shared.hideTabBar))
entries.append(.toggle(id: id.count, section: .tabs, settingName: .showTabNames, value: SGSimpleSettings.shared.showTabNames, text: i18n("Settings.Tabs.ShowNames", lang), enabled: !SGSimpleSettings.shared.hideTabBar))
entries.append(.toggle(id: id.count, section: .tabs, settingName: .wideTabBar, value: SGSimpleSettings.shared.wideTabBar, text: i18n("Settings.Tabs.WideTabBar", lang), enabled: !SGSimpleSettings.shared.hideTabBar))
entries.append(.notice(id: id.count, section: .tabs, text: i18n("Settings.Tabs.WideTabBar.Notice", lang)))
entries.append(.header(id: id.count, section: .folders, text: strings.Settings_ChatFolders.uppercased(), badge: nil))
entries.append(.toggle(id: id.count, section: .folders, settingName: .foldersAtBottom, value: experimentalUISettings.foldersTabAtBottom, text: i18n("Settings.Folders.BottomTab", lang), enabled: true))
@@ -373,6 +376,9 @@ public func sgSettingsController(context: AccountContext/*, focusOnItemTag: Int?
accountManager: context.sharedContext.accountManager, { $0.withUpdatedShowTab(value) }
)
).start()
case .wideTabBar:
SGSimpleSettings.shared.wideTabBar = value
askForRestart?()
case .foldersAtBottom:
let _ = (
updateExperimentalUISettingsInteractively(accountManager: context.sharedContext.accountManager, { settings in

5
Swiftgram/SGSimpleSettings/Sources/SimpleSettings.swift
View File

@@ -154,6 +154,7 @@ public class SGSimpleSettings {
case customAppBadge
case canUseNY
case nyStyle
case wideTabBar
}
public enum DownloadSpeedBoostValues: String, CaseIterable {
@@ -292,6 +293,7 @@ public class SGSimpleSettings {
Keys.customAppBadge.rawValue: "",
Keys.canUseNY.rawValue: false,
Keys.nyStyle.rawValue: NYStyle.default.rawValue,
Keys.wideTabBar.rawValue: false,
]
public static let groupDefaultValues: [String: Any] = [
@@ -534,6 +536,9 @@ public class SGSimpleSettings {
@UserDefault(key: Keys.nyStyle.rawValue)
public var nyStyle: String
@UserDefault(key: Keys.wideTabBar.rawValue)
public var wideTabBar: Bool
}
extension SGSimpleSettings {

2
Swiftgram/SGStrings/Strings/en.lproj/SGLocalizable.strings
View File

@@ -4,6 +4,8 @@
"Settings.Tabs.HideTabBar" = "Hide Tab bar";
"Settings.Tabs.ShowContacts" = "Show Contacts Tab";
"Settings.Tabs.ShowNames" = "Show Tab Names";
"Settings.Tabs.WideTabBar" = "Wide Tab bar";
"Settings.Tabs.WideTabBar.Notice" = "When enabled, the Tab bar keeps full width even when one or more tabs are hidden.";
"Settings.Folders.BottomTab" = "Folders at Bottom";
"Settings.Folders.BottomTabStyle" = "Bottom Folders Style";

3
submodules/TelegramUI/Components/TabBarComponent/Sources/TabBarComponent.swift
View File

@@ -369,7 +369,8 @@ public final class TabBarComponent: Component {
self.overrideUserInterfaceStyle = component.theme.overallDarkAppearance ? .dark : .light
let itemSize = CGSize(width: floor((availableSize.width - innerInset * 2.0) / CGFloat(component.items.count)), height: SGSimpleSettings.shared.showTabNames ? 56.0 : 40.0)
var itemSize = CGSize(width: floor((availableSize.width - innerInset * 2.0) / CGFloat(component.items.count)), height: SGSimpleSettings.shared.showTabNames ? 56.0 : 40.0)
if !SGSimpleSettings.shared.wideTabBar { itemSize.width = min(94.0, itemSize.width) }
let contentWidth: CGFloat = innerInset * 2.0 + CGFloat(component.items.count) * itemSize.width
let size = CGSize(width: min(availableSize.width, contentWidth), height: itemSize.height + innerInset * 2.0)