Skip to content

Replaced String with LocalizedStringKey in init #110

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Replaced String with LocalizedStringKey in init #110

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 19 additions & 14 deletions Sources/AlertToast/AlertToast.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,20 +198,20 @@ public struct AlertToast: View{
///`complete`, `error`, `systemImage`, `image`, `loading`, `regular`
public var type: AlertType

///The title of the alert (`Optional(String)`)
public var title: String? = nil
///The title of the alert (`Optional(LocalizedStringKey)`)
public var title: LocalizedStringKey? = nil

///The subtitle of the alert (`Optional(String)`)
public var subTitle: String? = nil
///The subtitle of the alert (`Optional(LocalizedStringKey)`)
public var subTitle: LocalizedStringKey? = nil

///Customize your alert appearance
public var style: AlertStyle? = nil

///Full init
public init(displayMode: DisplayMode = .alert,
type: AlertType,
title: String? = nil,
subTitle: String? = nil,
title: LocalizedStringKey? = nil,
subTitle: LocalizedStringKey? = nil,
style: AlertStyle? = nil){

self.displayMode = displayMode
Expand All @@ -224,7 +224,7 @@ public struct AlertToast: View{
///Short init with most used parameters
public init(displayMode: DisplayMode,
type: AlertType,
title: String? = nil){
title: LocalizedStringKey? = nil){

self.displayMode = displayMode
self.type = type
Expand Down Expand Up @@ -259,12 +259,17 @@ public struct AlertToast: View{
EmptyView()
}

Text(LocalizedStringKey(title ?? ""))
.font(style?.titleFont ?? Font.headline.bold())
if let title {
Text(title)
.font(style?.titleFont ?? Font.headline.bold())
} else {
Text("")
.font(style?.titleFont ?? Font.headline.bold())
}
}

if let subTitle = subTitle {
Text(LocalizedStringKey(subTitle))
Text(subTitle)
.font(style?.subTitleFont ?? Font.subheadline)
}
}
Expand Down Expand Up @@ -308,13 +313,13 @@ public struct AlertToast: View{
if title != nil || subTitle != nil{
VStack(alignment: type == .regular ? .center : .leading, spacing: 2){
if let title = title {
Text(LocalizedStringKey(title))
Text(title)
.font(style?.titleFont ?? Font.body.bold())
.multilineTextAlignment(.center)
.textColor(style?.titleColor ?? nil)
}
if let subTitle = subTitle {
Text(LocalizedStringKey(subTitle))
Text(subTitle)
.font(style?.subTitleFont ?? Font.footnote)
.opacity(0.7)
.multilineTextAlignment(.center)
Expand Down Expand Up @@ -374,13 +379,13 @@ public struct AlertToast: View{

VStack(spacing: type == .regular ? 8 : 2){
if let title = title {
Text(LocalizedStringKey(title))
Text(title)
.font(style?.titleFont ?? Font.body.bold())
.multilineTextAlignment(.center)
.textColor(style?.titleColor ?? nil)
}
if let subTitle = subTitle {
Text(LocalizedStringKey(subTitle))
Text(subTitle)
.font(style?.subTitleFont ?? Font.footnote)
.opacity(0.7)
.multilineTextAlignment(.center)
Expand Down