Skip to content

Ios final #38

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

Merged
danilpapa merged 2 commits into from
Jun 3, 2026
Merged

Ios final #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1ad1027
fix loader
danilpapa Jun 3, 2026
00cf25a
also fix error handling
danilpapa Jun 3, 2026
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
3 changes: 2 additions & 1 deletion iosApp/iosApp/DesignKit/Loading.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,12 @@
import SwiftUI

struct LoadingView: View {
let title: String

var body: some View {
VStack(spacing: 12) {
ProgressView()
Text("Loading friends...")
Text(title)
.font(.subheadline)
.foregroundColor(.secondary)
}
Expand Down
2 changes: 1 addition & 1 deletion iosApp/iosApp/Modules/Events/EventDetail/EventDetailView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ struct EventDetailView: View {

var body: some View {
if reducer.isLoading {
LoadingView()
LoadingView(title: "Loading event detail...")
} else if let errorMessage = reducer.errorMessage {
VStack(spacing: DesignTheme.Spacing.lg) {
Image(systemName: "exclamationmark.triangle.fill")
Expand Down
4 changes: 2 additions & 2 deletions iosApp/iosApp/Modules/Friends/FriendsView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ struct FriendsView: View {
var body: some View {
Group {
if reducer == nil {
LoadingView()
LoadingView(title: "Loading friend...")
} else {
VStack(spacing: 0) {
SearchBar(
Expand All @@ -44,7 +44,7 @@ struct FriendsView: View {
contentListView()
.overlay {
if reducer.isLoading {
LoadingView()
LoadingView(title: "Loading friends...")
}
}
.opacity(reducer.isLoading ? 0 : 1)
Expand Down
4 changes: 2 additions & 2 deletions iosApp/iosApp/Modules/Profile/ProfileView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ struct ProfileView: View {
var body: some View {
Group {
if profileReducer == nil {
LoadingView()
LoadingView(title: "Loading profile...")
} else if let profile = profileReducer.profile {
ScrollView {
VStack(spacing: DesignTheme.Spacing.xxl) {
Expand Down Expand Up @@ -70,7 +70,7 @@ struct ProfileView: View {
}
}
} else {
LoadingView()
LoadingView(title: "Loading profile...")
.onAppear {
profileReducer.loadProfile()
}
Expand Down
16 changes: 8 additions & 8 deletions shared/src/commonMain/kotlin/friends/mobile/core/domain/model/UserFriendlyError.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,14 @@ sealed class UserFriendlyError(open val message: String) {
}

fun mapApiErrorToUserFriendly(error: ApiError): UserFriendlyError = when (error.code) {
401 -> UserFriendlyError.Unauthorized(error.message)
403 -> UserFriendlyError.Forbidden(error.message)
404 -> UserFriendlyError.NotFound(error.message)
409 -> UserFriendlyError.Conflict(error.message)
in 400..499 -> UserFriendlyError.ClientError(error.message)
in 500..599 -> UserFriendlyError.Server(error.message)
-1 -> UserFriendlyError.Network(error.message)
else -> UserFriendlyError.Unknown(error.message)
401 -> UserFriendlyError.Unauthorized()
403 -> UserFriendlyError.Forbidden()
404 -> UserFriendlyError.NotFound()
409 -> UserFriendlyError.Conflict()
in 400..499 -> UserFriendlyError.ClientError()
in 500..599 -> UserFriendlyError.Server()
-1 -> UserFriendlyError.Network()
else -> UserFriendlyError.Unknown()
}

fun getErrorMessage(error: UserFriendlyError): String = error.message
Loading