diff --git a/client/ios/Configurations/Default.xcconfig b/client/ios/Configurations/Default.xcconfig index 760066648..d15bb4ad0 100644 --- a/client/ios/Configurations/Default.xcconfig +++ b/client/ios/Configurations/Default.xcconfig @@ -1,4 +1,5 @@ -MARKETING_VERSION = 1.0 +#include "Version.xcconfig" + CURRENT_PROJECT_VERSION = 1 DEVELOPMENT_TEAM = CXV565V7MX diff --git a/client/ios/Configurations/Version.xcconfig b/client/ios/Configurations/Version.xcconfig new file mode 100644 index 000000000..4cfad0eb7 --- /dev/null +++ b/client/ios/Configurations/Version.xcconfig @@ -0,0 +1 @@ +MARKETING_VERSION = 7.0.0 diff --git a/client/ios/DivKit/DivKitInfo.swift b/client/ios/DivKit/DivKitInfo.swift index c9b08f5d8..2f94e990b 100644 --- a/client/ios/DivKit/DivKitInfo.swift +++ b/client/ios/DivKit/DivKitInfo.swift @@ -1,3 +1,3 @@ public enum DivKitInfo { - public static let version = "2.3.0" + public static let version = "7.0.0" } diff --git a/client/ios/DivKitPlayground/UI/RadioButtonsView.swift b/client/ios/DivKitPlayground/UI/RadioButtonsView.swift index 5e5cee011..a0e2d9032 100644 --- a/client/ios/DivKitPlayground/UI/RadioButtonsView.swift +++ b/client/ios/DivKitPlayground/UI/RadioButtonsView.swift @@ -1,28 +1,30 @@ import SwiftUI struct RadioButtonsView: View { - let options: [String] @Binding var selected: String var body: some View { - VStack{ + VStack { ForEach(options, id: \.self) { option in - Button(action: { - selected = option - }) { - HStack{ + Button(action: { selected = option }) { + HStack { Text(option) .font(ThemeFont.text) .foregroundColor(Color(UIColor.label)) Spacer() Circle() - .fill(selected == option ? Color(UIColor.systemGreen) : Color(UIColor.systemGray4)) + .fill(selected == option ? Color.accentColor : Color(UIColor.secondarySystemBackground)) .frame(width: 20, height: 20) } } } } + .padding(20) + .background( + RoundedRectangle(cornerRadius: 22) + .stroke(Color(UIColor.secondarySystemBackground)) + ) } } diff --git a/client/ios/DivKitPlayground/UI/SettingsView.swift b/client/ios/DivKitPlayground/UI/SettingsView.swift index fa196f1c2..9bc34b8e2 100644 --- a/client/ios/DivKitPlayground/UI/SettingsView.swift +++ b/client/ios/DivKitPlayground/UI/SettingsView.swift @@ -1,5 +1,7 @@ import SwiftUI +import DivKit + struct SettingsView: View { @Environment(\.presentationMode) var presentationMode: Binding @@ -14,24 +16,26 @@ struct SettingsView: View { background: ThemeColor.settings, presentationMode: presentationMode ) { - Toggle(isOn: $isQrScannerEnabledKeymeMode) { - Text("QR Scanner") + VStack(alignment: .leading, spacing: 0) { + Toggle(isOn: $isQrScannerEnabledKeymeMode) { + Text("QR Scanner") + .font(ThemeFont.text) + } + + Text("Playground theme") + .font(ThemeFont.text) + .padding(EdgeInsets(top: 20, leading: 0, bottom: 10, trailing: 0)) + RadioButtonsView( + options: Theme.allCases.map { $0.rawValue }, + selected: $playgroundTheme + ) + + Spacer() + + Text("DivKit version \(DivKitInfo.version)") .font(ThemeFont.text) } .padding(20) - - Text("Playground theme") - .font(ThemeFont.text) - RadioButtonsView( - options: Theme.allCases.map { $0.rawValue }, - selected: $playgroundTheme - ) - .padding(20) - .background( - RoundedRectangle(cornerRadius: 22) - .stroke(Color.black.opacity(0.12)) - ) - .padding(20) } .toggleStyle(DefaultToggleStyle()) } diff --git a/client/web/divkit/package.json b/client/web/divkit/package.json index ee5538cd7..951722b93 100644 --- a/client/web/divkit/package.json +++ b/client/web/divkit/package.json @@ -1,6 +1,6 @@ { "name": "@divkitframework/divkit", - "version": "3.0.1", + "version": "7.0.0", "description": "DivKit for the web", "keywords": [ "server-driven-ui",