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

Videos cleanup #23

Merged
merged 2 commits into from
Jan 11, 2025
Merged

Videos cleanup #23

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
b985634
esthetic changes
panos1b Jan 11, 2025
1f7e5ab
Videos now work!
panos1b Jan 11, 2025
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/assets/videos/Bartender.mp4
View file
Open in desktop
Binary file not shown.
Binary file added app/src/main/assets/videos/Chef.mp4
View file
Open in desktop
Binary file not shown.
Binary file added app/src/main/assets/videos/Receptionist.mp4
View file
Open in desktop
Binary file not shown.
Binary file added app/src/main/assets/videos/Server.mp4
View file
Open in desktop
Binary file not shown.
Binary file modified app/src/main/assets/videos/test.mp4
View file
Open in desktop
Binary file not shown.
154 changes: 88 additions & 66 deletions app/src/main/java/com/example/estiaseek/ui/profile/ApplicantProfile.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ import androidx.compose.foundation.Image
import androidx.compose.foundation.background
import androidx.compose.foundation.border
import androidx.compose.foundation.clickable
import androidx.compose.foundation.gestures.Orientation
import androidx.compose.foundation.gestures.scrollable
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
Expand All @@ -27,6 +29,7 @@ import androidx.compose.material3.Scaffold
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.runtime.DisposableEffect
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.collectAsState
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
Expand All @@ -38,6 +41,7 @@ import androidx.compose.ui.draw.clip
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.layout.ContentScale
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
Expand All @@ -48,7 +52,7 @@ import androidx.media3.exoplayer.ExoPlayer
import androidx.media3.ui.AspectRatioFrameLayout
import androidx.media3.ui.PlayerView
import androidx.navigation.NavController
import coil.compose.rememberAsyncImagePainter
import com.example.estiaseek.R
import com.example.estiaseek.ui.components.BottomNavigationBar
import com.example.estiaseek.ui.components.byteArrayToImageBitmap
import com.example.estiaseek.ui.navigation.NavigationHelper
Expand All @@ -59,8 +63,39 @@ import com.example.estiaseek.ui.viewmodels.ProfileViewModel
@Composable
fun ApplicantProfile(
profileViewModel: ProfileViewModel,
navController: NavController
navController: NavController,
) {
val context = LocalContext.current
val profileViewState by profileViewModel.profileViewState.collectAsState()
var isMuted by remember { mutableStateOf(true) } // Track mute state

val videoPath = if (profileViewState.username.trim() == "Lil Pop") {
"file:///android_asset/videos/test.mp4" //our evaluation video
} else {
"file:///android_asset/videos/${profileViewState.jobTitle.trim()}.mp4"
}

// Remember ExoPlayer instance
val exoPlayer = remember {
ExoPlayer.Builder(context).build().apply {
setMediaItem(MediaItem.fromUri(Uri.parse(videoPath)))
prepare()
playWhenReady = true
volume = if (isMuted) 0f else 1f
}
}

LaunchedEffect(isMuted) {
exoPlayer.volume = if (isMuted) 0f else 1f
}

// Dispose of ExoPlayer correctly
DisposableEffect(exoPlayer) {
onDispose {
exoPlayer.release()
}
}

Scaffold(
bottomBar = {
BottomNavigationBar(
Expand All @@ -69,34 +104,17 @@ fun ApplicantProfile(
)
}
) { paddingValues ->
Column(modifier = Modifier.padding(0.dp).padding(paddingValues)) {
val context = LocalContext.current
val profileViewState by profileViewModel.profileViewState.collectAsState()

// Remember ExoPlayer instance
val exoPlayer = remember {
ExoPlayer.Builder(context).build().apply {
setMediaItem(MediaItem.fromUri(Uri.parse("file:///android_asset/videos/test.mp4")))
prepare()
playWhenReady = true
volume = 0f // Mute by default
}
}

var isMuted by remember { mutableStateOf(true) } // Track mute state

// Dispose of ExoPlayer correctly
DisposableEffect(Unit) {
onDispose {
exoPlayer.release()
}
}

Box(
modifier = Modifier
.fillMaxSize()
) {
Column(
modifier = Modifier
.fillMaxSize()
.padding(0.dp)
.background(MaterialTheme.colorScheme.background)
.verticalScroll(rememberScrollState())
.scrollable(rememberScrollState(), orientation = Orientation.Vertical)
) {
// Video Player Section
Box(
Expand All @@ -121,7 +139,8 @@ fun ApplicantProfile(

val imageBitmap = byteArrayToImageBitmap(profileViewState.photoData)
val title = profileViewState.username
val contentDescription = title.takeIf { imageBitmap != null } ?: "Placeholder"
val contentDescription =
title.takeIf { imageBitmap != null } ?: "Placeholder"
imageBitmap?.let { bitmap ->
Image(
bitmap = bitmap,
Expand All @@ -136,8 +155,8 @@ fun ApplicantProfile(
)
} ?: run {
Image(
painter = rememberAsyncImagePainter("file:///android_asset/images/lilpop.jpg"),
contentDescription = "com.example.estiaseek.ui.profile.Profile Picture",
painter = painterResource(id = R.drawable.lilpop),
contentDescription = "Profile Picture",
contentScale = ContentScale.Crop,
modifier = Modifier
.align(Alignment.BottomStart)
Expand Down Expand Up @@ -210,49 +229,52 @@ fun ApplicantProfile(
style = MaterialTheme.typography.bodyMedium
)

// Contact Section
Row(
modifier = Modifier
.fillMaxWidth()
.padding(top = 16.dp),
horizontalArrangement = Arrangement.spacedBy(16.dp)
) {
val context = LocalContext.current
}
}

Button(
onClick = {
val intent = Intent(Intent.ACTION_DIAL).apply {
data =
Uri.parse("tel:${profileViewState.phoneNumber}")
}
context.startActivity(intent)
},
modifier = Modifier.weight(1f)
) {
Text("Call")
}

Button(
onClick = {
val intent = Intent(Intent.ACTION_SENDTO).apply {
data =
Uri.parse("mailto:${profileViewState.email}")
}
context.startActivity(intent)
},
modifier = Modifier.weight(1f)
) {
Text("Email")
}
Column(
modifier = Modifier
.align(Alignment.BottomCenter)
.padding(paddingValues)
.padding(5.dp),
verticalArrangement = Arrangement.spacedBy(8.dp) // Optional spacing between elements
) {
// Contact Section
Row(
modifier = Modifier
.fillMaxWidth()
.padding(top = 16.dp),
horizontalArrangement = Arrangement.spacedBy(16.dp)
) {
val context = LocalContext.current

Button(
onClick = {
val intent = Intent(Intent.ACTION_DIAL).apply {
data =
Uri.parse("tel:${profileViewState.phoneNumber}")
}
context.startActivity(intent)
},
modifier = Modifier.weight(1f)
) {
Text("Call")
}

Button(
onClick = {
val intent = Intent(Intent.ACTION_SENDTO).apply {
data =
Uri.parse("mailto:${profileViewState.email}")
}
context.startActivity(intent)
},
modifier = Modifier.weight(1f)
) {
Text("Email")
}
}
}

// Dispose of ExoPlayer when the composable is disposed
DisposableEffect(exoPlayer) {
onDispose {
exoPlayer.release()
}
}
}
Expand Down
14 changes: 9 additions & 5 deletions app/src/main/java/com/example/estiaseek/ui/search/ResultsScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import androidx.navigation.NavController
import com.example.estiaseek.R
import com.example.estiaseek.ui.components.BottomNavigationBar
Expand Down Expand Up @@ -71,15 +71,18 @@ fun ResultsScreen(
)
}
) { paddingValues ->
Column(modifier = Modifier.padding(0.dp).padding(paddingValues)) {
Column(modifier = Modifier.padding(20.dp).padding(paddingValues)) {
Row(
modifier = Modifier
.fillMaxWidth()
.padding(bottom = 10.dp)
) {
Text(
text = stringResource(R.string.results),
fontSize = 35.sp
style = MaterialTheme.typography.headlineMedium.copy(
fontWeight = FontWeight.Bold
),
color = MaterialTheme.colorScheme.primary
)
}

Expand All @@ -90,8 +93,9 @@ fun ResultsScreen(
) {
Text(
text = stringResource(R.string.results_based_on_search_terms),
fontSize = 14.sp,
color = MaterialTheme.colorScheme.onSurface.copy(alpha = 0.7f)
style = MaterialTheme.typography.bodyLarge,
color = MaterialTheme.colorScheme.onSurface.copy(alpha = 0.7f),
modifier = Modifier.padding(top = 8.dp)
)
}

Expand Down
0 app/src/main/assets/images/lilpop.jpg → app/src/main/res/drawable/lilpop.jpg
View file
Open in desktop
File renamed without changes
Loading