Skip to content

fixed all #35

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
Raliiinz merged 1 commit into from
Jun 1, 2026
Merged

fixed all #35

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion composeApp/src/androidMain/kotlin/friends/mobile/App.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ package friends.mobile

import androidx.compose.runtime.Composable
import androidx.compose.ui.tooling.preview.Preview
import friends.mobile.auth.RootScreen
import friends.mobile.designsystem.theme.FriendsAppTheme
import friends.mobile.feature.auth.RootScreen

@Composable
@Preview
Expand Down
186 changes: 0 additions & 186 deletions composeApp/src/androidMain/kotlin/friends/mobile/auth/RegisterBottomSheet.kt
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions composeApp/src/androidMain/kotlin/friends/mobile/designsystem/components/ButtonFactory.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,16 @@ import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material3.Button
import androidx.compose.material3.ButtonDefaults
import androidx.compose.material3.CircularProgressIndicator
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.alpha
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.dp
import androidx.compose.material3.MaterialTheme
import androidx.compose.ui.res.stringResource
import friends.mobile.R
import friends.mobile.designsystem.theme.DesignTheme

Expand Down
2 changes: 1 addition & 1 deletion composeApp/src/androidMain/kotlin/friends/mobile/designsystem/components/FormFields.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ import androidx.compose.foundation.border
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.foundation.text.KeyboardOptions
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
import androidx.compose.material3.TextField
import androidx.compose.material3.TextFieldDefaults
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.material3.MaterialTheme
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.text.input.PasswordVisualTransformation
import androidx.compose.ui.unit.dp
Expand Down
29 changes: 0 additions & 29 deletions composeApp/src/androidMain/kotlin/friends/mobile/designsystem/components/FormMessages.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.Info
import androidx.compose.material.icons.filled.Warning
import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialTheme
Expand Down Expand Up @@ -46,31 +45,3 @@ fun FormErrorMessage(
)
}
}

@Composable
fun FormInfoMessage(
message: String,
modifier: Modifier = Modifier
) {
val primary = MaterialTheme.colorScheme.primary
Row(
modifier = modifier
.fillMaxWidth()
.background(primary.copy(alpha = 0.08f), RoundedCornerShape(10.dp))
.padding(12.dp),
verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.spacedBy(8.dp)
) {
Icon(
imageVector = Icons.Default.Info,
contentDescription = null,
tint = primary,
modifier = Modifier.size(13.dp)
)
Text(
text = message,
style = DesignTheme.Typography.bodySmallest,
color = primary.copy(alpha = 0.8f)
)
}
}
3 changes: 1 addition & 2 deletions composeApp/src/androidMain/kotlin/friends/mobile/designsystem/components/IndicatorFactory.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,18 @@ import androidx.compose.foundation.layout.size
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.automirrored.filled.Send
import androidx.compose.material.icons.filled.AccessTime
import androidx.compose.material.icons.filled.AccessTimeFilled
import androidx.compose.material.icons.filled.Cancel
import androidx.compose.material.icons.filled.CheckCircle
import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.vector.ImageVector
import androidx.compose.ui.unit.dp
import androidx.compose.material3.MaterialTheme
import friends.mobile.designsystem.theme.DesignTheme

object IndicatorFactory {
Expand Down
2 changes: 1 addition & 1 deletion composeApp/src/androidMain/kotlin/friends/mobile/designsystem/components/LoadingView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.material3.CircularProgressIndicator
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.material3.MaterialTheme
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.unit.dp
import friends.mobile.designsystem.theme.DesignTheme
Expand Down
4 changes: 2 additions & 2 deletions composeApp/src/androidMain/kotlin/friends/mobile/designsystem/components/SearchBar.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,19 @@ import androidx.compose.material.icons.filled.Search
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
import androidx.compose.material3.TextField
import androidx.compose.material3.TextFieldDefaults
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.input.ImeAction
import androidx.compose.ui.text.input.KeyboardCapitalization
import androidx.compose.ui.text.input.KeyboardType
import androidx.compose.material3.MaterialTheme
import androidx.compose.ui.unit.dp
import androidx.compose.ui.res.stringResource
import friends.mobile.R
import friends.mobile.designsystem.theme.DesignTheme

Expand Down
6 changes: 5 additions & 1 deletion composeApp/src/androidMain/kotlin/friends/mobile/designsystem/components/UserView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,11 @@ fun UserView(

val textStack: @Composable () -> Unit = {
Column(
horizontalAlignment = if (dimension == Dimension.Vertical) Alignment.CenterHorizontally else Alignment.Start,
horizontalAlignment = if (dimension == Dimension.Vertical) {
Alignment.CenterHorizontally
} else {
Alignment.Start
},
verticalArrangement = Arrangement.spacedBy(4.dp)
) {
Text(
Expand Down
Loading
Loading