Cleaned up imports in order to make merge easier

app/src/main/java/com/example/estiaseek/EstiaSeekScreen.kt

@@ -1,24 +1,17 @@
 package com.example.estiaseek
 
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.padding
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.collectAsState
-import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.dimensionResource
 import androidx.lifecycle.viewmodel.compose.viewModel
 import androidx.navigation.NavHostController
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
 import androidx.navigation.compose.rememberNavController
-import com.example.estiaseek.ui.screens.CreateApplicant
-import com.example.estiaseek.ui.screens.HomeScreen
 import com.example.estiaseek.ui.profile.Profile
-import com.example.estiaseek.ResultsScreen
 import com.example.estiaseek.ui.screens.CandidateSearchScreen
+import com.example.estiaseek.ui.screens.CreateApplicant
+import com.example.estiaseek.ui.screens.HomeScreen
 import com.example.estiaseek.ui.viewmodels.ProfileViewModel
-import com.example.estiaseek.ui.viewmodels.SearchUiState
 import com.example.estiaseek.ui.viewmodels.SearchViewModel
 
 

app/src/main/java/com/example/estiaseek/MainActivity.kt

@@ -7,11 +7,7 @@ import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Surface
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
-import com.example.estiaseek.ui.screens.CreateApplicant
-import com.example.estiaseek.ui.screens.CandidateSearchScreen
 import com.example.estiaseek.ui.theme.EstiaSeekTheme
 
 class MainActivity : ComponentActivity() {

app/src/main/java/com/example/estiaseek/ResultsScreen.kt

@@ -36,15 +36,12 @@ import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import androidx.lifecycle.viewmodel.compose.viewModel
 import androidx.navigation.compose.rememberNavController
 import com.example.estiaseek.ui.components.BottomNavigationBar
 import com.example.estiaseek.ui.components.ImageCard
 import com.example.estiaseek.ui.viewmodels.ProfileViewModel
-import com.example.estiaseek.ui.viewmodels.SearchUiState
 import com.example.estiaseek.ui.viewmodels.SearchViewModel
 
 @OptIn(ExperimentalMaterial3Api::class)

app/src/main/java/com/example/estiaseek/ui/components/BottomNavigationBar.kt

@@ -1,23 +1,16 @@
 package com.example.estiaseek.ui.components
 
 import androidx.compose.foundation.Image
-import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.fillMaxSize
 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.CircleShape
 import androidx.compose.material3.BottomAppBar
 import androidx.compose.material3.IconButton
-import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.unit.dp
 import androidx.navigation.NavController

app/src/main/java/com/example/estiaseek/ui/components/DropdownMenuField.kt

@@ -3,7 +3,6 @@ package com.example.estiaseek.ui.components
 import androidx.annotation.StringRes
 import androidx.compose.animation.core.animateFloatAsState
 import androidx.compose.foundation.background
-import androidx.compose.foundation.border
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.shape.RoundedCornerShape

app/src/main/java/com/example/estiaseek/ui/profile/Profile.kt

@@ -3,14 +3,14 @@ package com.example.estiaseek.ui.profile
 import android.content.Intent
 import android.net.Uri
 import androidx.annotation.OptIn
+import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
 import androidx.compose.foundation.border
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.foundation.Image
-import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material3.*
 import androidx.compose.runtime.*
@@ -24,14 +24,13 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.viewinterop.AndroidView
-import coil.compose.rememberAsyncImagePainter
 import androidx.media3.common.MediaItem
 import androidx.media3.common.util.UnstableApi
 import androidx.media3.exoplayer.ExoPlayer
 import androidx.media3.ui.AspectRatioFrameLayout
 import androidx.media3.ui.PlayerView
+import coil.compose.rememberAsyncImagePainter
 import com.example.estiaseek.ui.viewmodels.ProfileViewModel
-import com.example.estiaseek.ui.viewmodels.SearchUiState
 
 
 @OptIn(UnstableApi::class)

app/src/main/java/com/example/estiaseek/ui/screens/CandidateSearchScreen.kt

@@ -6,25 +6,21 @@ import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.rounded.LocationOn
+import androidx.compose.material.icons.rounded.Person
+import androidx.compose.material.icons.rounded.Search
+import androidx.compose.material.icons.rounded.Star
 import androidx.compose.material3.*
 import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Brush
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import com.example.estiaseek.R
 import com.example.estiaseek.ui.components.DropdownMenuField
-import androidx.compose.material.icons.rounded.LocationOn
-import androidx.compose.material.icons.rounded.Person
-import androidx.compose.material.icons.rounded.Search
-import androidx.compose.material.icons.rounded.Star
-import androidx.compose.runtime.saveable.rememberSaveable
-import androidx.compose.ui.graphics.Brush
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.text.font.FontWeight
-import androidx.lifecycle.ViewModel
-import androidx.lifecycle.viewmodel.compose.viewModel
 import com.example.estiaseek.ui.viewmodels.SearchUiState
 import com.example.estiaseek.ui.viewmodels.SearchViewModel
 
@@ -151,7 +147,7 @@ fun CandidateSearchScreen(
             // Search Button
             Button(
                 onClick = {
-                    onSearchButtonClicked(searchUiState);
+                    onSearchButtonClicked(searchUiState)
                     /* TODO Search action to be implemented */
                 },
                 modifier = Modifier