diff --git a/app/src/main/java/com/menagerie/ophelia/database/polycule/PolyculeApplication.kt b/app/src/main/java/com/menagerie/ophelia/database/polycule/PolyculeApplication.kt index d192ef1..5e7ebda 100644 --- a/app/src/main/java/com/menagerie/ophelia/database/polycule/PolyculeApplication.kt +++ b/app/src/main/java/com/menagerie/ophelia/database/polycule/PolyculeApplication.kt @@ -8,6 +8,6 @@ class PolyculeApplication : Application() { private val applicationScope = CoroutineScope(SupervisorJob()) - val database by lazy { PolyculeDatabase.getDatabase(this, applicationScope)} - val repository by lazy { PolyculeRepository(database.bioDao())} + val database by lazy { PolyculeDatabase.getDatabase(this, applicationScope) } + val repository by lazy { PolyculeRepository(database.bioDao()) } } \ No newline at end of file diff --git a/app/src/main/java/com/menagerie/ophelia/database/polycule/PolyculeDatabase.kt b/app/src/main/java/com/menagerie/ophelia/database/polycule/PolyculeDatabase.kt index 97ba878..1b99dd1 100644 --- a/app/src/main/java/com/menagerie/ophelia/database/polycule/PolyculeDatabase.kt +++ b/app/src/main/java/com/menagerie/ophelia/database/polycule/PolyculeDatabase.kt @@ -6,11 +6,9 @@ import androidx.room.Database import androidx.room.Room import androidx.room.RoomDatabase import androidx.sqlite.db.SupportSQLiteDatabase -import com.menagerie.ophelia.R import com.menagerie.ophelia.database.polycule.entity.Bio import com.menagerie.ophelia.database.polycule.entity.BioDao import kotlinx.coroutines.CoroutineScope -import kotlinx.coroutines.flow.count import kotlinx.coroutines.launch @@ -72,7 +70,6 @@ abstract class PolyculeDatabase : RoomDatabase() { var bio = Bio( name = "Azea", description = init, - pfpRes = R.drawable.ic_app_logo ) bioDao.insert(bio) @@ -85,7 +82,6 @@ abstract class PolyculeDatabase : RoomDatabase() { bio = Bio( name = "Darkwood Mill", description = init, - pfpRes = R.drawable.ic_app_logo ) bioDao.insert(bio) @@ -97,11 +93,8 @@ abstract class PolyculeDatabase : RoomDatabase() { bio = Bio( name = "Blizzard", description = init, - pfpRes = R.drawable.ic_app_logo ) bioDao.insert(bio) - val count = bioDao.getAllAlphabetisedBios().count() } } - } \ No newline at end of file diff --git a/app/src/main/java/com/menagerie/ophelia/database/polycule/PolyculeDatabaseManager.kt b/app/src/main/java/com/menagerie/ophelia/database/polycule/PolyculeDatabaseManager.kt index 240c224..a119475 100644 --- a/app/src/main/java/com/menagerie/ophelia/database/polycule/PolyculeDatabaseManager.kt +++ b/app/src/main/java/com/menagerie/ophelia/database/polycule/PolyculeDatabaseManager.kt @@ -3,7 +3,7 @@ package com.menagerie.ophelia.database.polycule import com.menagerie.ophelia.database.polycule.entity.Bio object PolyculeDatabaseManager { - lateinit var polyculeRepository : PolyculeRepository + lateinit var polyculeRepository: PolyculeRepository suspend fun post(bio: Bio) { polyculeRepository.upsertBio(bio) diff --git a/app/src/main/java/com/menagerie/ophelia/database/polycule/PolyculeRepository.kt b/app/src/main/java/com/menagerie/ophelia/database/polycule/PolyculeRepository.kt index 9982108..bee114f 100644 --- a/app/src/main/java/com/menagerie/ophelia/database/polycule/PolyculeRepository.kt +++ b/app/src/main/java/com/menagerie/ophelia/database/polycule/PolyculeRepository.kt @@ -4,11 +4,9 @@ import com.menagerie.ophelia.database.polycule.entity.Bio import com.menagerie.ophelia.database.polycule.entity.BioDao import kotlinx.coroutines.flow.Flow - class PolyculeRepository( private val bioDao: BioDao ) { - suspend fun upsertBio(bio: Bio) { return bioDao.upsert(bio) } @@ -24,7 +22,8 @@ class PolyculeRepository( fun getAllBios(): Flow> { return bioDao.getAllBios() } - suspend fun insert(bio : Bio) { + + suspend fun insert(bio: Bio) { bioDao.insert(bio) } diff --git a/app/src/main/java/com/menagerie/ophelia/database/polycule/entity/BioDao.kt b/app/src/main/java/com/menagerie/ophelia/database/polycule/entity/BioDao.kt index d17577c..febd7ea 100644 --- a/app/src/main/java/com/menagerie/ophelia/database/polycule/entity/BioDao.kt +++ b/app/src/main/java/com/menagerie/ophelia/database/polycule/entity/BioDao.kt @@ -18,7 +18,7 @@ abstract class BioDao { abstract suspend fun delete(bio: Bio) @Update - abstract suspend fun update(existingBio: Bio) : Int + abstract suspend fun update(existingBio: Bio): Int @Query("SELECT * FROM bio_table ORDER BY name ASC") abstract fun getAllAlphabetisedBios(): Flow> diff --git a/app/src/main/java/com/menagerie/ophelia/database/polycule/entity/Identity.kt b/app/src/main/java/com/menagerie/ophelia/database/polycule/entity/Identity.kt index f63e5e9..c2ed523 100644 --- a/app/src/main/java/com/menagerie/ophelia/database/polycule/entity/Identity.kt +++ b/app/src/main/java/com/menagerie/ophelia/database/polycule/entity/Identity.kt @@ -1,6 +1,5 @@ package com.menagerie.ophelia.database.polycule.entity -import android.graphics.drawable.Icon import androidx.room.Entity import androidx.room.PrimaryKey @@ -14,7 +13,5 @@ import androidx.room.PrimaryKey ) class Identity ( @PrimaryKey(autoGenerate = true) val id: Long = 0, - val uniqueId: Long = 0, val name: String = "", - val icon: Icon, ) \ No newline at end of file diff --git a/app/src/main/java/com/menagerie/ophelia/database/polycule/entity/IdentityDao.kt b/app/src/main/java/com/menagerie/ophelia/database/polycule/entity/IdentityDao.kt index a613ac8..3b524aa 100644 --- a/app/src/main/java/com/menagerie/ophelia/database/polycule/entity/IdentityDao.kt +++ b/app/src/main/java/com/menagerie/ophelia/database/polycule/entity/IdentityDao.kt @@ -13,8 +13,8 @@ abstract class IdentityDao { @Update abstract suspend fun update(idenity: Identity) - @Query("SELECT * FROM Identity WHERE uniqueId = :uniqueId") - abstract suspend fun findByIdentity(uniqueId : Long): Identity? + @Query("SELECT * FROM Identity WHERE id = :uniqueId") + abstract suspend fun findByIdentity(uniqueId: Int): Identity? } \ No newline at end of file diff --git a/app/src/main/java/com/menagerie/ophelia/database/polycule/entity/viewmodel/BioDetailViewModel.kt b/app/src/main/java/com/menagerie/ophelia/database/polycule/entity/viewmodel/BioDetailViewModel.kt index 974e741..6f17c45 100644 --- a/app/src/main/java/com/menagerie/ophelia/database/polycule/entity/viewmodel/BioDetailViewModel.kt +++ b/app/src/main/java/com/menagerie/ophelia/database/polycule/entity/viewmodel/BioDetailViewModel.kt @@ -1,25 +1,20 @@ package com.menagerie.ophelia.database.polycule.entity.viewmodel -import androidx.lifecycle.SavedStateHandle import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.asLiveData import com.menagerie.ophelia.database.polycule.PolyculeDatabaseManager -import com.menagerie.ophelia.database.polycule.PolyculeRepository -class BioDetailViewModel() : ViewModel(){ +class BioDetailViewModel() : ViewModel() { private var bioId: Int = 0 var bio = PolyculeDatabaseManager.polyculeRepository.getBio(bioId).asLiveData() - fun setBio(bioId: Int) - { + fun setBio(bioId: Int) { this.bioId = bioId bio = PolyculeDatabaseManager.polyculeRepository.getBio(bioId).asLiveData() } - - class BioDetailViewModelFactory() : ViewModelProvider.Factory { override fun create(modelClass: Class, ): T { diff --git a/app/src/main/java/com/menagerie/ophelia/database/polycule/entity/viewmodel/BioListViewModel.kt b/app/src/main/java/com/menagerie/ophelia/database/polycule/entity/viewmodel/BioListViewModel.kt index 09243f0..83e4ebc 100644 --- a/app/src/main/java/com/menagerie/ophelia/database/polycule/entity/viewmodel/BioListViewModel.kt +++ b/app/src/main/java/com/menagerie/ophelia/database/polycule/entity/viewmodel/BioListViewModel.kt @@ -12,7 +12,8 @@ import kotlinx.coroutines.launch class BioListViewModel() : ViewModel() { - val allBios: LiveData> = PolyculeDatabaseManager.polyculeRepository.getAllBios().asLiveData() + val allBios: LiveData> = + PolyculeDatabaseManager.polyculeRepository.getAllBios().asLiveData() fun upsert(bio: Bio) = viewModelScope.launch { PolyculeDatabaseManager.polyculeRepository.upsertBio(bio) diff --git a/app/src/main/java/com/menagerie/ophelia/ui/theme/Color.kt b/app/src/main/java/com/menagerie/ophelia/ui/theme/Color.kt index 5936a2e..ee64671 100644 --- a/app/src/main/java/com/menagerie/ophelia/ui/theme/Color.kt +++ b/app/src/main/java/com/menagerie/ophelia/ui/theme/Color.kt @@ -5,7 +5,6 @@ import androidx.compose.ui.graphics.Color val Purple80 = Color(0xFFFF00FF) val PurpleGrey80 = Color(0xFFCCC2DC) val Pink80 = Color(0xFFEFB8C8) -val Transparent = Color(0x00000000) val Purple40 = Color(0x0000FF22) val PurpleGrey40 = Color(0xFF625b71) diff --git a/app/src/main/java/com/menagerie/ophelia/ui/theme/Theme.kt b/app/src/main/java/com/menagerie/ophelia/ui/theme/Theme.kt index 0501c80..c1fa312 100644 --- a/app/src/main/java/com/menagerie/ophelia/ui/theme/Theme.kt +++ b/app/src/main/java/com/menagerie/ophelia/ui/theme/Theme.kt @@ -25,16 +25,6 @@ private val LightColorScheme = lightColorScheme( primary = Purple40, secondary = PurpleGrey40, tertiary = Pink40 - - /* Other default colors to override - background = Color(0xFFFFFBFE), - surface = Color(0xFFFFFBFE), - onPrimary = Color.White, - onSecondary = Color.White, - onTertiary = Color.White, - onBackground = Color(0xFF1C1B1F), - onSurface = Color(0xFF1C1B1F), - */ ) @Composable diff --git a/app/src/main/java/com/menagerie/ophelia/ui/theme/Type.kt b/app/src/main/java/com/menagerie/ophelia/ui/theme/Type.kt index e16738e..4be722c 100644 --- a/app/src/main/java/com/menagerie/ophelia/ui/theme/Type.kt +++ b/app/src/main/java/com/menagerie/ophelia/ui/theme/Type.kt @@ -9,7 +9,7 @@ import androidx.compose.ui.unit.sp // Set of Material typography styles to start with val Typography = Typography( bodyLarge = TextStyle( - fontFamily = FontFamily.Default, + fontFamily = FontFamily.Serif, fontWeight = FontWeight.Normal, fontSize = 16.sp, lineHeight = 24.sp, diff --git a/app/src/main/java/com/menagerie/ophelia/view/HomeScreen.kt b/app/src/main/java/com/menagerie/ophelia/view/HomeScreen.kt index 4d756b0..3d73f8b 100644 --- a/app/src/main/java/com/menagerie/ophelia/view/HomeScreen.kt +++ b/app/src/main/java/com/menagerie/ophelia/view/HomeScreen.kt @@ -65,7 +65,7 @@ fun HomeBioScreen( Column( modifier = modifier - ){ + ) { BioCardList(bioList = items, onBioClick = onBioClick) FloatingActionButton( onClick = onAddClick @@ -87,12 +87,11 @@ fun HomeTopAppBar( Row( Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.Center, - ) { + ) { } }, modifier = modifier.statusBarsPadding(), actions = {}, scrollBehavior = scrollBehavior ) -} - +} \ No newline at end of file diff --git a/app/src/main/java/com/menagerie/ophelia/view/PolyculeApp.kt b/app/src/main/java/com/menagerie/ophelia/view/PolyculeApp.kt index fe7ef33..d2331f5 100644 --- a/app/src/main/java/com/menagerie/ophelia/view/PolyculeApp.kt +++ b/app/src/main/java/com/menagerie/ophelia/view/PolyculeApp.kt @@ -1,8 +1,6 @@ package com.menagerie.ophelia.view -import android.app.Activity import androidx.compose.runtime.Composable -import androidx.compose.ui.platform.LocalContext import androidx.navigation.NavHostController import androidx.navigation.NavType import androidx.navigation.compose.NavHost @@ -12,7 +10,6 @@ import androidx.navigation.navArgument import com.menagerie.ophelia.view.biographies.AddBiography import com.menagerie.ophelia.view.biographies.BioDetailsScreen - @Composable fun PolyculeApp() { val navController = rememberNavController() @@ -25,8 +22,6 @@ fun PolyculeApp() { fun PolyculeNavHost( navController: NavHostController ) { - val activity = (LocalContext.current as Activity) - NavHost( navController = navController, startDestination = "home" @@ -37,7 +32,7 @@ fun PolyculeNavHost( navController.navigate("bioDetail/${it.id}") }, onAddClick = { - navController.navigate("addBio") + navController.navigate("addBio") } ) } diff --git a/app/src/main/java/com/menagerie/ophelia/view/biographies/AddEditBiography.kt b/app/src/main/java/com/menagerie/ophelia/view/biographies/AddEditBiography.kt index fa4c067..02c7551 100644 --- a/app/src/main/java/com/menagerie/ophelia/view/biographies/AddEditBiography.kt +++ b/app/src/main/java/com/menagerie/ophelia/view/biographies/AddEditBiography.kt @@ -2,6 +2,8 @@ package com.menagerie.ophelia.view.biographies import android.annotation.SuppressLint import android.widget.Toast +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding import androidx.compose.foundation.text.KeyboardActions @@ -13,18 +15,19 @@ import androidx.compose.runtime.livedata.observeAsState import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.LocalFocusManager +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.tooling.preview.datasource.LoremIpsum import androidx.compose.ui.unit.dp import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel import androidx.lifecycle.viewmodel.compose.viewModel import com.menagerie.ophelia.R -import com.menagerie.ophelia.database.polycule.entity.viewmodel.BioListViewModel import com.menagerie.ophelia.database.polycule.entity.Bio +import com.menagerie.ophelia.database.polycule.entity.viewmodel.BioListViewModel import com.menagerie.ophelia.view.components.InputFieldComponent -import androidx.compose.foundation.layout.Column -import androidx.compose.foundation.layout.Spacer import com.menagerie.ophelia.view.components.fab.FABComponent +import kotlin.random.Random fun insertBioInDB(bio: Bio?, mBioListViewModel: BioListViewModel) { bio?.let { @@ -33,7 +36,6 @@ fun insertBioInDB(bio: Bio?, mBioListViewModel: BioListViewModel) { } @SuppressLint("UnusedMaterial3ScaffoldPaddingParameter") -@OptIn(ExperimentalMaterial3Api::class) @Composable fun AddBiography() { val inputViewModel = InputViewModel() @@ -43,14 +45,14 @@ fun AddBiography() { ) Scaffold( - floatingActionButton = { - FABComponent(text = "${R.string.add_bio}", onClick = { - insertBioInDB(inputViewModel.bio.value, mBioListViewModel) + floatingActionButton = { + FABComponent(text = "${stringResource(id = R.string.add_bio)}", onClick = { + insertBioInDB(inputViewModel.bio.value, mBioListViewModel) - Toast.makeText(context, "Added Bio", Toast.LENGTH_SHORT).show() - }) - } - ) + Toast.makeText(context, "Added Bio", Toast.LENGTH_SHORT).show() + }) + } + ) { InputFieldState(inputViewModel) } @@ -62,9 +64,10 @@ fun InputFieldState( ) { val bio: Bio by inputViewModel.bio.observeAsState(Bio()) Column( - modifier = Modifier.padding(16.dp)){ - InputField(bio.name){inputViewModel.onInputChange(it)} - Spacer(modifier = Modifier.padding(10.dp)) + modifier = Modifier.padding(16.dp) + ) { + InputField(bio.name) { inputViewModel.onInputChange(it) } + Spacer(modifier = Modifier.padding(10.dp)) } } @@ -75,7 +78,7 @@ fun InputField( ) { val focusManager = LocalFocusManager.current - if(onValChange != null) { + if (onValChange != null) { InputFieldComponent( text = name, onChange = onValChange, @@ -83,7 +86,7 @@ fun InputField( modifier = Modifier .padding(all = 16.dp) .fillMaxWidth(), - keyboardActions = KeyboardActions( onDone = {focusManager.clearFocus()}) + keyboardActions = KeyboardActions(onDone = { focusManager.clearFocus() }) ) } } @@ -91,11 +94,15 @@ fun InputField( class InputViewModel : ViewModel() { private val _bio: MutableLiveData = MutableLiveData(Bio()) val bio: LiveData = _bio - - fun onInputChange(name: String) - { + fun onInputChange(name: String) { + var desc = LoremIpsum(Random.nextInt(5,100)).values.toList() + var init = "" + repeat(desc.size) { + init += ("${desc[it]} ") + } val newBio = Bio( name = name, + description = init, ) _bio.value = newBio } diff --git a/app/src/main/java/com/menagerie/ophelia/view/biographies/BioCard.kt b/app/src/main/java/com/menagerie/ophelia/view/biographies/BioCard.kt index 38f1cee..f5eef54 100644 --- a/app/src/main/java/com/menagerie/ophelia/view/biographies/BioCard.kt +++ b/app/src/main/java/com/menagerie/ophelia/view/biographies/BioCard.kt @@ -3,7 +3,6 @@ package com.menagerie.ophelia.view.biographies import androidx.compose.foundation.BorderStroke import androidx.compose.foundation.ExperimentalFoundationApi import androidx.compose.foundation.Image -import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Row @@ -36,9 +35,8 @@ 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 com.menagerie.ophelia.database.polycule.entity.Bio -@OptIn(ExperimentalMaterial3Api::class, ExperimentalFoundationApi::class) +@OptIn(ExperimentalMaterial3Api::class) @Composable fun BioCard( name: String, @@ -48,14 +46,13 @@ fun BioCard( onDeleteClick: () -> Unit ) { var expanded by remember { mutableStateOf(false) } - + Card( onClick = onBioClick, modifier = Modifier .padding(10.dp) .fillMaxWidth() - .wrapContentHeight() - , + .wrapContentHeight(), shape = MaterialTheme.shapes.medium, elevation = CardDefaults.cardElevation( defaultElevation = 6.dp @@ -91,15 +88,15 @@ fun BioCard( { IconButton( onClick = { expanded = true }) { - Icon( - Icons.Default.MoreVert, - contentDescription = "" - ) + Icon( + Icons.Default.MoreVert, + contentDescription = "" + ) } DropdownMenu(expanded = expanded, onDismissRequest = { expanded = false }) { - DropdownMenuItem(text = { Text(text = "Delete")}, onClick = onDeleteClick) + DropdownMenuItem(text = { Text(text = "Delete") }, onClick = onDeleteClick) } } } - } + } } \ No newline at end of file diff --git a/app/src/main/java/com/menagerie/ophelia/view/biographies/BioCardList.kt b/app/src/main/java/com/menagerie/ophelia/view/biographies/BioCardList.kt index 3d1d4d3..6642c44 100644 --- a/app/src/main/java/com/menagerie/ophelia/view/biographies/BioCardList.kt +++ b/app/src/main/java/com/menagerie/ophelia/view/biographies/BioCardList.kt @@ -55,7 +55,7 @@ fun BioCardList( name = bio.name, description = bio.description, image = bio.pfpRes, - onBioClick = {onBioClick(bio)}, + onBioClick = { onBioClick(bio) }, onDeleteClick = { mBioListViewModel.delete(bio) }) } } diff --git a/app/src/main/java/com/menagerie/ophelia/view/biographies/BioDetailsScreen.kt b/app/src/main/java/com/menagerie/ophelia/view/biographies/BioDetailsScreen.kt index 22ed243..b0acad9 100644 --- a/app/src/main/java/com/menagerie/ophelia/view/biographies/BioDetailsScreen.kt +++ b/app/src/main/java/com/menagerie/ophelia/view/biographies/BioDetailsScreen.kt @@ -1,16 +1,11 @@ package com.menagerie.ophelia.view.biographies -import android.util.Log import androidx.compose.foundation.Image import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.filled.Edit -import androidx.compose.material3.FloatingActionButton -import androidx.compose.material3.Icon import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Surface import androidx.compose.material3.Text @@ -23,10 +18,10 @@ import androidx.compose.ui.platform.LocalDensity import androidx.compose.ui.res.painterResource import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp +import androidx.constraintlayout.compose.ConstraintLayout import androidx.lifecycle.viewmodel.compose.viewModel import com.menagerie.ophelia.database.polycule.entity.Bio import com.menagerie.ophelia.database.polycule.entity.viewmodel.BioDetailViewModel -import androidx.constraintlayout.compose.ConstraintLayout import com.menagerie.ophelia.view.components.utils.Dimens data class BioDetailCallbacks( @@ -45,7 +40,7 @@ fun BioDetailsScreen( val bio = mBioDetailViewModel.bio.observeAsState().value - if(bio != null) { + if (bio != null) { Surface { BioDetails( bio, @@ -80,10 +75,10 @@ fun BioDetails( fun BioDetailContents( bio: Bio, imageHeight: Dp, -){ +) { Column { ConstraintLayout { - val(image, info) = createRefs() + val (image, info) = createRefs() Image( painter = painterResource(id = bio.pfpRes), contentDescription = null, diff --git a/app/src/main/java/com/menagerie/ophelia/view/components/InputFieldComponent.kt b/app/src/main/java/com/menagerie/ophelia/view/components/InputFieldComponent.kt index 36c94d6..688299d 100644 --- a/app/src/main/java/com/menagerie/ophelia/view/components/InputFieldComponent.kt +++ b/app/src/main/java/com/menagerie/ophelia/view/components/InputFieldComponent.kt @@ -1,14 +1,11 @@ package com.menagerie.ophelia.view.components import androidx.compose.foundation.text.KeyboardActions -import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.OutlinedTextField import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier -import androidx.compose.ui.modifier.modifierLocalConsumer -@OptIn(ExperimentalMaterial3Api::class) @Composable fun InputFieldComponent( text: String, diff --git a/app/src/main/java/com/menagerie/ophelia/view/components/fab/FABComponent.kt b/app/src/main/java/com/menagerie/ophelia/view/components/fab/FABComponent.kt index f838e6e..457a110 100644 --- a/app/src/main/java/com/menagerie/ophelia/view/components/fab/FABComponent.kt +++ b/app/src/main/java/com/menagerie/ophelia/view/components/fab/FABComponent.kt @@ -14,7 +14,7 @@ fun FABComponent( ExtendedFloatingActionButton( onClick = onClick, elevation = FloatingActionButtonDefaults.elevation(8.dp) - ){ + ) { Text(text = text) } } \ No newline at end of file diff --git a/app/src/main/java/com/menagerie/ophelia/view/components/utils/TextSnackbarContainer.kt b/app/src/main/java/com/menagerie/ophelia/view/components/utils/TextSnackbarContainer.kt index e0813d2..71a2719 100644 --- a/app/src/main/java/com/menagerie/ophelia/view/components/utils/TextSnackbarContainer.kt +++ b/app/src/main/java/com/menagerie/ophelia/view/components/utils/TextSnackbarContainer.kt @@ -16,7 +16,6 @@ import androidx.compose.runtime.remember import androidx.compose.runtime.rememberUpdatedState import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier -import androidx.compose.ui.modifier.modifierLocalConsumer import androidx.compose.ui.unit.dp @Composable diff --git a/app/src/main/java/com/menagerie/ophelia/view/splash/SplashActivity().kt b/app/src/main/java/com/menagerie/ophelia/view/splash/SplashActivity().kt index 5516a1f..55a81fe 100644 --- a/app/src/main/java/com/menagerie/ophelia/view/splash/SplashActivity().kt +++ b/app/src/main/java/com/menagerie/ophelia/view/splash/SplashActivity().kt @@ -12,7 +12,6 @@ import kotlinx.coroutines.delay @SuppressLint("CustomSplashScreen") class SplashActivity : ComponentActivity() { - override fun onCreate(savedInstanceState: Bundle?) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) { @@ -25,12 +24,13 @@ class SplashActivity : ComponentActivity() { lifecycleScope.launchWhenCreated { delay(1500) - val intent = Intent(this@SplashActivity, - MainActivity::class.java) + val intent = Intent( + this@SplashActivity, + MainActivity::class.java + ) startActivity(intent) finish() } } - } \ No newline at end of file