Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Binary file added app/src/main/ic_launcher-playstore.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion app/src/main/java/com/delecrode/devhub/di/AppModule.kt
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ val appModule = module {
viewModel { RepoDetailViewModel(get()) }
viewModel { AuthViewModel(get()) }
viewModel { SessionViewModel(get()) }
viewModel { RegisterViewModel(get()) }
viewModel { RegisterViewModel(get(),get()) }
viewModel { ProfileViewModel(get(), get()) }
viewModel { RepoFavViewModel(get()) }
viewModel { ForgotPasswordViewModel(get()) }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue
import androidx.compose.ui.Modifier
import androidx.compose.ui.focus.FocusDirection
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.vector.ImageVector
import androidx.compose.ui.platform.LocalFocusManager
import androidx.compose.ui.res.painterResource
Expand All @@ -35,6 +36,7 @@ import androidx.compose.ui.unit.dp
import com.delecrode.devhub.R
import com.delecrode.devhub.presentation.ui.theme.DevHubTheme
import com.delecrode.devhub.presentation.ui.theme.PrimaryBlue
import com.delecrode.devhub.presentation.ui.theme.Success


@Composable
Expand All @@ -59,7 +61,7 @@ fun EmailTextField(
MaterialTheme.colorScheme.background,
RoundedCornerShape(8.dp)
),
placeholder = { Text(label) },
placeholder = { Text(label, color = MaterialTheme.colorScheme.onBackground) },
leadingIcon = {
Icon(
imageVector = Icons.Default.Person,
Expand Down Expand Up @@ -134,7 +136,7 @@ fun PasswordTextField(
modifier = modifier
.fillMaxWidth()
.background(MaterialTheme.colorScheme.background, RoundedCornerShape(8.dp)),
placeholder = { Text(label) },
placeholder = { Text(label, color = MaterialTheme.colorScheme.onBackground) },
leadingIcon = {
Icon(
imageVector = Icons.Default.Lock,
Expand Down Expand Up @@ -225,6 +227,9 @@ fun GenericOutlinedTextField(
modifier: Modifier = Modifier,
label: String,
leadingIcon: ImageVector? = null,
trailingIcon: @Composable (() -> Unit)? = null,
isSuccess: Boolean = false,
successMessage: String = "",
isError: Boolean = false,
errorMessage: String = "",
keyboardType: KeyboardType = KeyboardType.Text,
Expand All @@ -238,7 +243,7 @@ fun GenericOutlinedTextField(
value = value,
onValueChange = onValueChange,
modifier = modifier.fillMaxWidth(),
placeholder = { Text(label) },
placeholder = { Text(label, color = MaterialTheme.colorScheme.onBackground) },
leadingIcon = {
leadingIcon?.let {
Icon(
Expand All @@ -248,6 +253,7 @@ fun GenericOutlinedTextField(
)
}
},
trailingIcon = trailingIcon,
isError = isError,
keyboardOptions = KeyboardOptions(
keyboardType = keyboardType,
Expand All @@ -262,9 +268,20 @@ fun GenericOutlinedTextField(
focusedContainerColor = MaterialTheme.colorScheme.background,
unfocusedContainerColor = MaterialTheme.colorScheme.background,
disabledContainerColor = MaterialTheme.colorScheme.background,
focusedIndicatorColor = MaterialTheme.colorScheme.onBackground,
unfocusedIndicatorColor = MaterialTheme.colorScheme.onBackground,
errorIndicatorColor = MaterialTheme.colorScheme.error
focusedIndicatorColor = when {
isError -> MaterialTheme.colorScheme.error
isSuccess -> Color.Green
else -> MaterialTheme.colorScheme.onBackground
},

unfocusedIndicatorColor = when {
isError -> MaterialTheme.colorScheme.error
isSuccess -> Color.Green
else -> MaterialTheme.colorScheme.onBackground
},

errorIndicatorColor = MaterialTheme.colorScheme.error,

),
shape = RoundedCornerShape(8.dp)
)
Expand All @@ -277,6 +294,14 @@ fun GenericOutlinedTextField(
modifier = Modifier.padding(start = 16.dp, top = 4.dp)
)
}
if (isSuccess && successMessage.isNotEmpty()) {
Text(
text = successMessage,
color = Success,
style = MaterialTheme.typography.bodySmall,
modifier = Modifier.padding(start = 16.dp, top = 4.dp)
)
}
}
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,18 +1,21 @@
package com.delecrode.devhub.presentation.components

import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.width
import androidx.compose.foundation.layout.wrapContentSize
import androidx.compose.foundation.shape.CircleShape
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment.Companion.CenterHorizontally
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
import androidx.compose.ui.graphics.Color
Expand All @@ -24,54 +27,59 @@ import coil.compose.AsyncImage

@Composable
fun UserProfileHeader(avatar_url: String?,name: String, login: String, bio: String ) {
if(avatar_url != null){
Box(
modifier = Modifier
.background(Color.White, shape = CircleShape)
.wrapContentSize()
) {
AsyncImage(
model = avatar_url,
contentDescription = "Foto de Perfil",
modifier = Modifier
.size(100.dp)
.clip(CircleShape)
)
}
}

Spacer(modifier = Modifier.height(16.dp))
Column(modifier = Modifier.fillMaxWidth(), horizontalAlignment = Alignment.Start, verticalArrangement = Arrangement.Center){
Row(modifier = Modifier.fillMaxWidth()){
if(avatar_url != null){
Box(
modifier = Modifier
.background(Color.White, shape = CircleShape)
.wrapContentSize()
) {
AsyncImage(
model = avatar_url,
contentDescription = "Foto de Perfil",
modifier = Modifier
.size(68.dp)
.clip(CircleShape)
)
}
}
Spacer(modifier = Modifier.width(6.dp))

Column(
modifier = Modifier.fillMaxWidth(),
horizontalAlignment = CenterHorizontally
) {
Spacer(modifier = Modifier.height(12.dp))
Column(
modifier = Modifier.fillMaxWidth(),
horizontalAlignment = Alignment.Start
) {

Text(
text = name,
fontWeight = FontWeight.Bold,
fontSize = 28.sp,
color = MaterialTheme.colorScheme.onBackground
)

Spacer(modifier = Modifier.height(12.dp))
Text(
text = name,
fontWeight = FontWeight.Bold,
fontSize = 28.sp,
color = MaterialTheme.colorScheme.onBackground
)

Text(
text = login,
fontWeight = FontWeight.Bold,
fontSize = 20.sp,
color = MaterialTheme.colorScheme.onBackground
)

Spacer(modifier = Modifier.height(12.dp))
Text(
text = login,
fontWeight = FontWeight.Bold,
fontSize = 20.sp,
color = MaterialTheme.colorScheme.onBackground
)

Text(
text = bio,
fontWeight = FontWeight.Bold,
fontSize = 18.sp,
textAlign = TextAlign.Center,
color = MaterialTheme.colorScheme.onBackground
)
}

}
}

Spacer(modifier = Modifier.height(12.dp))

Text(
text = bio,
fontWeight = FontWeight.Normal,
fontSize = 18.sp,
textAlign = TextAlign.Start,
color = MaterialTheme.colorScheme.onBackground
)
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material3.CenterAlignedTopAppBar
import androidx.compose.material3.CircularProgressIndicator
import androidx.compose.material3.ExperimentalMaterial3Api
Expand All @@ -29,6 +30,7 @@ import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.painterResource
Expand All @@ -41,10 +43,10 @@ import androidx.compose.ui.unit.sp
import androidx.navigation.NavController
import androidx.navigation.compose.rememberNavController
import com.delecrode.devhub.R
import com.delecrode.devhub.presentation.navigation.AppDestinations
import com.delecrode.devhub.presentation.components.EmailTextField
import com.delecrode.devhub.presentation.components.PasswordTextField
import com.delecrode.devhub.presentation.components.PrimaryButton
import com.delecrode.devhub.presentation.navigation.AppDestinations
import org.koin.androidx.compose.koinViewModel

@OptIn(ExperimentalMaterial3Api::class)
Expand Down Expand Up @@ -115,11 +117,18 @@ fun LoginScreen(navController: NavController, viewModel: AuthViewModel) {
verticalArrangement = Arrangement.Center,
horizontalAlignment = Alignment.CenterHorizontally
) {
Box(modifier = Modifier.fillMaxWidth(), contentAlignment = Alignment.Center){
Box(
modifier = Modifier
.fillMaxWidth()
.height(220.dp),
contentAlignment = Alignment.Center
) {
Image(
painter = painterResource(R.drawable.git_logo),
painter = painterResource(R.drawable.dev_hub_logo),
contentDescription = "Logo",
modifier = Modifier.size(100.dp),
modifier = Modifier
.size(220.dp)
.clip(RoundedCornerShape(8.dp))
)
}

Expand Down
Loading