Skip to content

Commit

Permalink
Merge pull request #82 from sheikh-20/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
sheikh-20 authored Jun 21, 2024
2 parents 91e1270 + f41af0b commit 869e705
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 5 deletions.
4 changes: 2 additions & 2 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@ android {
applicationId = "com.application.moviesapp"
minSdk = 24
targetSdk = 33
versionCode = 18
versionName = "1.0.17"
versionCode = 19
versionName = "1.0.18"

testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
vectorDrawables {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,12 @@ package com.application.moviesapp.ui.detail
import android.app.Activity
import androidx.compose.foundation.background
import androidx.compose.foundation.clickable
import androidx.compose.foundation.interaction.MutableInteractionSource
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
Expand Down Expand Up @@ -103,7 +105,16 @@ fun DetailScreenApp(modifier: Modifier = Modifier,

Scaffold(
topBar = { DetailTopAppbar(navController = navController) },
snackbarHost = { SnackbarHost(snackbarHostState) }
snackbarHost = { SnackbarHost(snackbarHostState) {
androidx.compose.material3.Snackbar(
modifier = modifier.padding(8.dp),
containerColor = MaterialTheme.colorScheme.background,
contentColor = MaterialTheme.colorScheme.onPrimary
) {
Text(text = it.visuals.message, fontWeight = FontWeight.SemiBold)
}
}
}
) { paddingValues ->

NavHost(navController = navController, startDestination = DetailScreen.Detail.name) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -431,7 +431,7 @@ fun HomeApp(modifier: Modifier = Modifier,
when (result) {
SnackbarResult.ActionPerformed -> {
navController.popBackStack()
navController.navigate(BottomNavigationScreens.Explore.route) }
navController.navigate(BottomNavigationScreens.MyList.route) }
else -> { }
}
} },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ fun MyListScreen(modifier: Modifier = Modifier,
.fillMaxSize()
.padding(horizontal = 16.dp, vertical = 4.dp)
.background(
MaterialTheme.colorScheme.secondaryContainer,
MaterialTheme.colorScheme.primaryContainer,
FilterChipDefaults.shape,
)
) {}
Expand Down

0 comments on commit 869e705

Please sign in to comment.