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

πŸ”€ :: (#376) - Change the regex on regular_expression #377

Merged
merged 2 commits into from
Sep 5, 2023
Merged

πŸ”€ :: (#376) - Change the regex on regular_expression #377

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
21bfc9a
✨ :: Change the keyboard type on want pay and gsm score
leehyeonbin Sep 5, 2023
1f3792f
πŸ”₯ :: Remove the un used log
leehyeonbin Sep 5, 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
18 changes: 14 additions & 4 deletions ...n/src/main/java/com/sms/presentation/main/ui/fill_out_information/screen/ProfileScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,17 @@ package com.sms.presentation.main.ui.fill_out_information.screen

import android.net.Uri
import androidx.compose.foundation.background
import androidx.compose.foundation.layout.*
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.verticalScroll
import androidx.compose.runtime.*
import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.unit.dp
Expand Down Expand Up @@ -34,7 +41,7 @@ fun ProfileScreen(
onDialogDissmissButtonClick: () -> Unit,
onSnackBarVisibleChanged: (text: String) -> Unit,
onProfileValueChanged: (data: ProfileData) -> Unit,
onTechStackItemRemoved: (item: String) -> Unit
onTechStackItemRemoved: (item: String) -> Unit,
) {
val scrollState = rememberScrollState()
val isRequired = remember {
Expand Down Expand Up @@ -88,7 +95,10 @@ fun ProfileScreen(
selectedMajor = selectedMajor,
enteredMajor = data.enteredMajor,
profileImageUri = profileImageUri,
detailStacks = if (detailStacks.size > 5) detailStacks.subList(0, 5) else detailStacks,
detailStacks = if (detailStacks.size > 5) detailStacks.subList(
0,
5
) else detailStacks,
changeView = {
if (detailStacks.size < 5) {
navController.navigate("Search")
Expand Down
2 changes: 1 addition & 1 deletion presentation/src/main/java/com/sms/presentation/main/ui/util/extension.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,6 @@ fun String.isEmailRegularExpression(): Boolean {
}

fun String.isUrlRegularExpression(): Boolean {
val urlRegex = Regex("^(http(s)?://)?[\\w.-]+\\.[a-zA-Z]{2,3}(/\\S*)?\$")
val urlRegex = Regex("^https?:\\/\\/.*$")
return matches(urlRegex)
}