Skip to content

Commit

Permalink
Update Resources
Browse files Browse the repository at this point in the history
  • Loading branch information
@aromanov91
aromanov91 committed Sep 1, 2023
1 parent fe38e34 commit 7a8deb7
Show file tree
Hide file tree
Showing 13 changed files with 174 additions and 177 deletions.
4 changes: 2 additions & 2 deletions Package.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ let productionDependencies: [PackageDescription.Package.Dependency] = { [
.package(url: "https://github.com/oversizedev/OversizeServices.git", .upToNextMajor(from: "1.4.0")),
.package(url: "https://github.com/oversizedev/OversizeLocalizable.git", .upToNextMajor(from: "1.4.0")),
.package(url: "https://github.com/oversizedev/OversizeComponents.git", .upToNextMajor(from: "1.2.0")),
.package(url: "https://github.com/oversizedev/OversizeResources.git", .upToNextMajor(from: "1.3.0")),
.package(url: "https://github.com/oversizedev/OversizeResources.git", .upToNextMajor(from: "2.0.0")),
.package(url: "https://github.com/hmlongco/Factory.git", .upToNextMajor(from: "2.1.3")),
.package(url: "https://github.com/lorenzofiamingo/swiftui-cached-async-image.git", .upToNextMajor(from: "2.1.1")),
/*
Expand All @@ -29,8 +29,8 @@ let developmentDependencies: [PackageDescription.Package.Dependency] = { [
.package(name: "OversizeResources", path: "../OversizeResources"),
.package(name: "OversizeNetwork", path: "../OversizeNetwork"),
.package(url: "https://github.com/lorenzofiamingo/swiftui-cached-async-image.git", .upToNextMajor(from: "2.1.1")),
.package(url: "https://github.com/hmlongco/Factory.git", .upToNextMajor(from: "2.1.3")),
/*
.package(url: "https://github.com/hmlongco/Factory.git", .upToNextMajor(from: "2.1.3")),
.package(url: "https://github.com/apple/swift-openapi-runtime", .upToNextMinor(from: "0.1.0")),
.package(url: "https://github.com/apple/swift-openapi-urlsession", .upToNextMinor(from: "0.1.0")),
*/
Expand Down
44 changes: 22 additions & 22 deletions Sources/OversizeKit/SettingsKit/Views/About/AboutView.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ import SwiftUI

if isLargeScreen {
HStack(spacing: .xxSmall) {
Icon.Solid.SocialMediaandBrands.oversize
Image.Brands.Oversize.fill
.resizable()
.renderingMode(.template)
.foregroundColor(Color.onSurfaceHighEmphasis)
Expand All @@ -108,7 +108,7 @@ import SwiftUI

} else {
VStack(spacing: .xxSmall) {
Icon.Solid.SocialMediaandBrands.oversize
Image.Brands.Oversize.fill
.resizable()
.renderingMode(.template)
.foregroundColor(Color.onSurfaceHighEmphasis)
Expand Down Expand Up @@ -300,7 +300,7 @@ import SwiftUI
// Surface {
HStack {
Spacer()
Icon.Solid.SocialMediaandBrands.facebook
Image.Brands.Facebook.Circle.fill
.renderingMode(.template)
.foregroundColor(Color.onSurfaceMediumEmphasis)
Spacer()
Expand All @@ -314,7 +314,7 @@ import SwiftUI
// Surface {
HStack {
Spacer()
Icon.Solid.SocialMediaandBrands.instagram
Image.Brands.Instagram.fill
.renderingMode(.template)
.foregroundColor(Color.onSurfaceMediumEmphasis)
Spacer()
Expand All @@ -328,7 +328,7 @@ import SwiftUI
// Surface {
HStack {
Spacer()
Icon.Solid.SocialMediaandBrands.twitter
Image.Brands.xCom
.renderingMode(.template)
.foregroundColor(Color.onSurfaceMediumEmphasis)
Spacer()
Expand All @@ -342,7 +342,7 @@ import SwiftUI
// Surface {
HStack {
Spacer()
Icon.Solid.SocialMediaandBrands.telegram
Image.Brands.Telegram.fill
.renderingMode(.template)
.foregroundColor(Color.onSurfaceMediumEmphasis)
Spacer()
Expand All @@ -356,7 +356,7 @@ import SwiftUI
// Surface {
HStack {
Spacer()
Icon.Solid.SocialMediaandBrands.dribbble
Image.Brands.Dribbble.fill
.renderingMode(.template)
.foregroundColor(Color.onSurfaceMediumEmphasis)
Spacer()
Expand Down Expand Up @@ -458,33 +458,33 @@ import SwiftUI
var rateSettingsIcon: Image {
switch iconStyle {
case .line:
return Icon.Line.UserInterface.heart
case .solid:
return Icon.Solid.UserInterface.heart
case .duotone:
return Icon.Duotone.UserInterface.heart
return Image.Base.heart
case .fill:
return Image.Base.Heart.fill
case .twoTone:
return Image.Base.Heart.TwoTone.fill
}
}

var ideaSettingsIcon: Image {
switch iconStyle {
case .line:
return Icon.Line.DevicesandElectronics.lightBulb
case .solid:
return Icon.Solid.DevicesandElectronics.lightBulb
case .duotone:
return Icon.Duotone.DevicesandElectronics.lightBulb
return Image.Electricity.lamp
case .fill:
return Image.Electricity.Lamp.fill
case .twoTone:
return Image.Electricity.Lamp.TwoTone.fill
}
}

var shareSettingsIcon: Image {
switch iconStyle {
case .line:
return Icon.Line.UserInterface.export
case .solid:
return Icon.Solid.UserInterface.export
case .duotone:
return Icon.Duotone.UserInterface.export
return Image.Base.send
case .fill:
return Image.Base.Send.fill
case .twoTone:
return Image.Base.Send.TwoTone.fill
}
}
}
Expand Down
31 changes: 15 additions & 16 deletions Sources/OversizeKit/SettingsKit/Views/About/FeedbackView.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import OversizeComponents
import OversizeLocalizable
import OversizeResources
import OversizeServices

import OversizeUI
import SwiftUI

Expand Down Expand Up @@ -102,33 +101,33 @@ public struct FeedbackView: View {
var heartIcon: Image {
switch iconStyle {
case .line:
return Icon.Line.SocialMediaandBrands.apple
case .solid:
return Icon.Solid.SocialMediaandBrands.apple
case .duotone:
return Icon.Duotone.SocialMediaandBrands.apple
return Image.Brands.appStore
case .fill:
return Image.Brands.AppStore.fill
case .twoTone:
return Image.Brands.AppStore.twoTone
}
}

var mailIcon: Image {
switch iconStyle {
case .line:
return Icon.Line.Communication.mail
case .solid:
return Icon.Solid.Communication.mail
case .duotone:
return Icon.Duotone.Communication.mail
return Image.Email.email
case .fill:
return Image.Email.Email.fill
case .twoTone:
return Image.Email.Email.twoTone
}
}

var chatIcon: Image {
switch iconStyle {
case .line:
return Icon.Line.SocialMediaandBrands.telegram
case .solid:
return Icon.Solid.SocialMediaandBrands.telegram
case .duotone:
return Icon.Duotone.SocialMediaandBrands.telegram
return Image.Brands.telegram
case .fill:
return Image.Brands.Telegram.fill
case .twoTone:
return Image.Brands.Telegram.twoTone
}
}
}
23 changes: 11 additions & 12 deletions Sources/OversizeKit/SettingsKit/Views/About/OurResorsesView.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import OversizeComponents
import OversizeLocalizable
import OversizeResources
import OversizeServices

import OversizeUI
import SwiftUI

Expand All @@ -22,7 +21,7 @@ public struct OurResorsesView: View {
public var body: some View {
PageView("Our open resources") {
links
.surfaceContentRowInsets()
.surfaceContentRowMargins()
}
.leadingBar {
BarButton(.back)
Expand Down Expand Up @@ -57,22 +56,22 @@ public struct OurResorsesView: View {
var figmaIcon: Image {
switch iconStyle {
case .line:
return Icon.Line.SocialMediaandBrands.figma
case .solid:
return Icon.Solid.SocialMediaandBrands.figma
case .duotone:
return Icon.Duotone.SocialMediaandBrands.figma
return Image.Brands.figma
case .fill:
return Image.Brands.figma
case .twoTone:
return Image.Brands.figma
}
}

var githubIcon: Image {
switch iconStyle {
case .line:
return Icon.Line.SocialMediaandBrands.github
case .solid:
return Icon.Solid.SocialMediaandBrands.github
case .duotone:
return Icon.Duotone.SocialMediaandBrands.github
return Image.Brands.github
case .fill:
return Image.Brands.github
case .twoTone:
return Image.Brands.github
}
}
}
31 changes: 15 additions & 16 deletions Sources/OversizeKit/SettingsKit/Views/About/SupportView.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import OversizeComponents
import OversizeLocalizable
import OversizeResources
import OversizeServices

import OversizeUI
import SwiftUI

Expand Down Expand Up @@ -93,33 +92,33 @@ public struct SupportView: View {
var heartIcon: Image {
switch iconStyle {
case .line:
return Icon.Line.SocialMediaandBrands.apple
case .solid:
return Icon.Solid.SocialMediaandBrands.apple
case .duotone:
return Icon.Duotone.SocialMediaandBrands.apple
return Image.Brands.appStore
case .fill:
return Image.Brands.AppStore.fill
case .twoTone:
return Image.Brands.AppStore.twoTone
}
}

var mailIcon: Image {
switch iconStyle {
case .line:
return Icon.Line.Communication.mail
case .solid:
return Icon.Solid.Communication.mail
case .duotone:
return Icon.Duotone.Communication.mail
return Image.Email.email
case .fill:
return Image.Email.Email.fill
case .twoTone:
return Image.Email.Email.twoTone
}
}

var chatIcon: Image {
switch iconStyle {
case .line:
return Icon.Line.SocialMediaandBrands.telegram
case .solid:
return Icon.Solid.SocialMediaandBrands.telegram
case .duotone:
return Icon.Duotone.SocialMediaandBrands.telegram
return Image.Brands.telegram
case .fill:
return Image.Brands.Telegram.fill
case .twoTone:
return Image.Brands.Telegram.twoTone
}
}

Expand Down
34 changes: 16 additions & 18 deletions Sources/OversizeKit/SettingsKit/Views/Apperance/AppearanceSettingView.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,7 @@

import OversizeCore
import OversizeLocalizable
import OversizeResources
import OversizeServices

import OversizeUI
import SwiftUI

Expand Down Expand Up @@ -66,7 +64,7 @@ import SwiftUI
#if os(iOS)
PageView(L10n.Settings.apperance) {
iOSSettings
.surfaceContentRowInsets()
.surfaceContentRowMargins()
}
.leadingBar {
/*
Expand Down Expand Up @@ -271,33 +269,33 @@ import SwiftUI
var textIcon: Image {
switch iconStyle {
case .line:
return Icon.Line.Design.text
case .solid:
return Icon.Solid.Design.text
case .duotone:
return Icon.Duotone.Design.text
return Image.Editor.Font.square
case .fill:
return Image.Editor.Font.Square.fill
case .twoTone:
return Image.Editor.Font.Square.TwoTone.fill
}
}

var borderIcon: Image {
switch iconStyle {
case .line:
return Icon.Line.Design.scale
case .solid:
return Icon.Solid.Design.scale
case .duotone:
return Icon.Duotone.Design.scale
return Image.Design.verticalMirror
case .fill:
return Image.Editor.Font.Square.fill
case .twoTone:
return Image.Editor.Font.Square.TwoTone.fill
}
}

var radiusIcon: Image {
switch iconStyle {
case .line:
return Icon.Line.Design.vectorEditCircle
case .solid:
return Icon.Solid.Design.vectorEditCircle
case .duotone:
return Icon.Duotone.Design.vectorEditCircle
return Image.Design.path
case .fill:
return Image.Design.Path.fill
case .twoTone:
return Image.Design.Path.twoTone
}
}
}
Expand Down
7 changes: 4 additions & 3 deletions Sources/OversizeKit/SettingsKit/Views/Security/SecuritySettingsView.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import SwiftUI
public var body: some View {
PageView(L10n.Security.title) {
iOSSettings
.surfaceContentRowInsets()
.surfaceContentRowMargins()
}
.leadingBar {
BarButton(.back)
Expand Down Expand Up @@ -60,7 +60,8 @@ import SwiftUI
Row(biometricService.biometricType.rawValue) {
Image(systemName: biometricImageName)
.foregroundColor(Color.onBackgroundHighEmphasis)
.font(.system(size: 24))

.font(.system(size: 20, weight: .semibold))
.frame(width: 24, height: 24, alignment: .center)
}
}
Expand All @@ -79,7 +80,7 @@ import SwiftUI
})
) {
Row(L10n.Security.pinCode) {
IconDeprecated(.lock)
Image.Security.lock
}
}.sheet(item: $isSetPINCodeSheet) { sheet in
SetPINCodeView(action: sheet)
Expand Down
Loading

0 comments on commit 7a8deb7

Please sign in to comment.