Skip to content
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

Jump to bottom

[iOS] 🔧 The numerical value where cornerRadius is currently assigned is replaced by the defined Radius value. #1199

Merged
merged 5 commits into from
Sep 14, 2023
Merged

[iOS] 🔧 The numerical value where cornerRadius is currently assigned is replaced by the defined Radius value. #1199

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ebf07f4
:wrench: The numerical value where cornerRadius is currently assigned…
Corvus400 Sep 12, 2023
dc57157
Merge branch 'main' into feature/apply_radius
Corvus400 Sep 12, 2023
b2a4dc1
Merge branch 'main' into feature/apply_radius
Corvus400 Sep 12, 2023
d59eb50
Merge branch 'main' into feature/apply_radius
Corvus400 Sep 13, 2023
a8e5f29
Merge branch 'main' into feature/apply_radius
Corvus400 Sep 14, 2023
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
2 changes: 1 addition & 1 deletion app-ios/Modules/Sources/About/AboutView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ public struct AboutView<ContributorView: View, StaffView: View, SponsorView: Vie
.padding(.vertical, 20)
.padding(.horizontal, 16)
.background(AssetColors.Surface.surfaceContainerLow.swiftUIColor)
.clipShape(RoundedRectangle(cornerRadius: 12))
.clipShape(RoundedRectangle(cornerRadius: RadiusTokens.s))
Spacer().frame(height: 32)
SectionTitle(title: L10n.About.creditsTitle)
NavigationLink(value: AboutRouting.staffs) {
Expand Down
4 changes: 2 additions & 2 deletions app-ios/Modules/Sources/Component/PersonLabel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ public struct PersonLabel: View {
}
.frame(width: 60, height: 60)
.scaledToFill()
.clipShape(RoundedRectangle(cornerRadius: 12))
.clipShape(RoundedRectangle(cornerRadius: RadiusTokens.s))
.overlay(
RoundedRectangle(cornerRadius: 12)
RoundedRectangle(cornerRadius: RadiusTokens.s)
.stroke(AssetColors.Outline.outline.swiftUIColor, lineWidth: 1)
)
}
Expand Down
7 changes: 3 additions & 4 deletions app-ios/Modules/Sources/Session/SessionView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ public struct SessionView: View {
.background(
AssetColors.Surface.surfaceContainerLow.swiftUIColor
)
.clipShape(RoundedRectangle(cornerRadius: 12))
.clipShape(RoundedRectangle(cornerRadius: RadiusTokens.s))
.padding(.vertical, 20)
.padding(.horizontal, 16)

Expand Down Expand Up @@ -82,7 +82,6 @@ public struct SessionView: View {
Text(L10n.Session.speakers)
.textStyle(TypographyTokens.titleLarge)
.foregroundStyle(AssetColors.Surface.onSurfaceVariant.swiftUIColor)

VStack(alignment: .leading, spacing: SpacingTokens.xs) {
ForEach(viewModel.timetableItem.speakers, id: \.id) { speaker in
HStack(spacing: SpacingTokens.xl) {
Expand All @@ -93,9 +92,9 @@ public struct SessionView: View {
}
.frame(width: 40, height: 40)
.scaledToFill()
.clipShape(RoundedRectangle(cornerRadius: 12))
.clipShape(RoundedRectangle(cornerRadius: RadiusTokens.s))
.overlay(
RoundedRectangle(cornerRadius: 12)
RoundedRectangle(cornerRadius: RadiusTokens.s)
.stroke(AssetColors.Outline.outline.swiftUIColor, lineWidth: 1)
)
VStack(alignment: .leading, spacing: 0) {
Expand Down
2 changes: 1 addition & 1 deletion app-ios/Modules/Sources/Sponsor/SponsorGridView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ struct SponsorItemView: View {
}
}
.frame(height: sponsor.plan.itemHeight)
.clipShape(RoundedRectangle(cornerRadius: 8, style: .continuous))
.clipShape(RoundedRectangle(cornerRadius: RadiusTokens.xs, style: .continuous))
}
}

Expand Down
2 changes: 1 addition & 1 deletion app-ios/Modules/Sources/Timetable/Bookmark/BookmarkView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ private struct BookmarkEmptyView: View {
.frame(width: 36, height: 36)
.padding(24)
.background(AssetColors.Secondary.secondaryContainer.swiftUIColor)
.clipShape(RoundedRectangle(cornerRadius: 24))
.clipShape(RoundedRectangle(cornerRadius: RadiusTokens.xl))
Spacer().frame(height: 24)
Text(L10n.Bookmark.bookmarksNotFound)
.textStyle(TypographyTokens.titleLarge)
Expand Down
4 changes: 2 additions & 2 deletions app-ios/Modules/Sources/Timetable/FilterLabel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@ struct FilterLabel: View {
? AssetColors.Secondary.onSecondaryContainer.swiftUIColor
: AssetColors.Surface.onSurface.swiftUIColor
)
.clipShape(RoundedRectangle(cornerRadius: 4))
.clipShape(RoundedRectangle(cornerRadius: RadiusTokens.xxs))
.overlay {
if !isSelected {
RoundedRectangle(cornerRadius: 4)
RoundedRectangle(cornerRadius: RadiusTokens.xxs)
.inset(by: 0.5)
.stroke(
AssetColors.Outline.outline.swiftUIColor,
Expand Down
4 changes: 2 additions & 2 deletions app-ios/Modules/Sources/Timetable/PersonLabel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ struct PersonLabel: View {
}
.frame(width: 40, height: 40)
.scaledToFill()
.clipShape(RoundedRectangle(cornerRadius: 12))
.clipShape(RoundedRectangle(cornerRadius: RadiusTokens.s))
.overlay(
RoundedRectangle(cornerRadius: 12)
RoundedRectangle(cornerRadius: RadiusTokens.s)
.stroke(AssetColors.Outline.outline.swiftUIColor, lineWidth: 1)
)

Expand Down
2 changes: 1 addition & 1 deletion app-ios/Modules/Sources/Timetable/Search/SearchView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ private struct SearchEmptyView: View {
.frame(width: 36, height: 36)
.padding(24)
.background(AssetColors.Secondary.secondaryContainer.swiftUIColor)
.clipShape(RoundedRectangle(cornerRadius: 24))
.clipShape(RoundedRectangle(cornerRadius: RadiusTokens.xl))
Text(L10n.Search.searchResultNotFound(inputText))
.textStyle(TypographyTokens.titleMedium)
.multilineTextAlignment(.center)
Expand Down
Loading