Skip to content

Commit

Permalink
cache refactor
Browse files Browse the repository at this point in the history
  • Loading branch information
pramodbharti committed Nov 3, 2023
1 parent 6e73217 commit 4e73074
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 49 deletions.
Original file line number Diff line number Diff line change
@@ -1,38 +1,20 @@
package com.pramodbharti.filmo.ui.navigation

import androidx.annotation.DrawableRes
import androidx.compose.foundation.BorderStroke
import androidx.compose.foundation.background
import androidx.compose.foundation.border
import androidx.compose.foundation.layout.absolutePadding
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.Favorite
import androidx.compose.material.icons.filled.PlayArrow
import androidx.compose.material.icons.filled.Send
import androidx.compose.material3.Divider
import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.NavigationBar
import androidx.compose.material3.NavigationBarItem
import androidx.compose.material3.Surface
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.drawBehind
import androidx.compose.ui.draw.shadow
import androidx.compose.ui.geometry.Offset
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.toArgb
import androidx.compose.ui.graphics.vector.ImageVector
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.res.vectorResource
import androidx.compose.ui.unit.dp
import com.pramodbharti.filmo.ui.theme.filmoDarkSurface
import com.pramodbharti.filmo.ui.theme.filmoLightSurface

val list = listOf(Movies, TvShows, Favs)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,9 @@ package com.pramodbharti.filmo.ui.navigation

import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.KeyboardArrowLeft
import androidx.compose.runtime.Composable
import androidx.compose.ui.graphics.vector.ImageVector
import androidx.navigation.NavType
import androidx.navigation.navArgument
import com.pramodbharti.filmo.ui.screens.details.DetailsScreen
import com.pramodbharti.filmo.ui.screens.favs.FavItemsScreen
import com.pramodbharti.filmo.ui.screens.movies.MoviesScreen
import com.pramodbharti.filmo.ui.screens.seeall.SeeAllScreen
import com.pramodbharti.filmo.ui.screens.tvshows.TvShowsScreen

interface FilmoDestination {
val icon: ImageVector?
Expand Down Expand Up @@ -42,9 +36,4 @@ object Details : FilmoDestination {
navArgument(mediaId) { type = NavType.IntType },
navArgument(mediaType) { type = NavType.StringType }
)
}

object SeeAll : FilmoDestination {
override val icon = Icons.Filled.KeyboardArrowLeft
override val route = "see_all"
}
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import androidx.navigation.compose.rememberNavController
import com.pramodbharti.filmo.ui.screens.details.DetailsScreen
import com.pramodbharti.filmo.ui.screens.favs.FavItemsScreen
import com.pramodbharti.filmo.ui.screens.movies.MoviesScreen
import com.pramodbharti.filmo.ui.screens.seeall.SeeAllScreen
import com.pramodbharti.filmo.ui.screens.tvshows.TvShowsScreen

@Composable
Expand All @@ -32,7 +31,7 @@ fun FilmoNavHost(
navController.navigateToDetailsScreen(item.id, item.mediaType)
},
onSeeAllClick = {
topBarTitle(it)
// TODO: not implemented
})
}

Expand All @@ -43,7 +42,7 @@ fun FilmoNavHost(
navController.navigateToDetailsScreen(item.id, item.mediaType)
},
onSeeAllClick = {
topBarTitle(it)
// TODO: not implemented
}
)
}
Expand All @@ -53,11 +52,6 @@ fun FilmoNavHost(
// TODO: delete this item from database
})
}

composable(SeeAll.route) {
SeeAllScreen()
}

composable(
route = Details.routeWithArgs,
arguments = Details.arguments
Expand Down
Original file line number Diff line number Diff line change
@@ -1,26 +1,17 @@
import android.content.res.Configuration.UI_MODE_NIGHT_NO
import android.content.res.Configuration.UI_MODE_NIGHT_YES
import android.util.Log
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.rememberScrollState
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.Favorite
import androidx.compose.material.icons.filled.PlayArrow
import androidx.compose.material.icons.filled.Send
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.Scaffold
import androidx.compose.material3.Surface
import androidx.compose.material3.TopAppBarDefaults
import androidx.compose.material3.rememberTopAppBarState
import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableIntStateOf
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.saveable.rememberSaveable
import androidx.compose.runtime.setValue
import androidx.compose.ui.Modifier
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import androidx.navigation.compose.currentBackStackEntryAsState
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ 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.TextStyle
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.tooling.preview.Preview
Expand All @@ -49,7 +50,6 @@ import coil.request.ImageRequest
import com.pramodbharti.filmo.R
import com.pramodbharti.filmo.dummydata.dummyCastData
import com.pramodbharti.filmo.dummydata.dummyMovies
import com.pramodbharti.filmo.ui.Constants
import com.pramodbharti.filmo.ui.components.CastItemsRow
import com.pramodbharti.filmo.ui.components.CastSlots
import com.pramodbharti.filmo.ui.components.ErrorScreen
Expand Down Expand Up @@ -153,7 +153,9 @@ fun ItemDetails(

IconButton(
onClick = onBackPressed,
modifier = Modifier.align(Alignment.TopStart).padding(start = 8.dp)
modifier = Modifier
.align(Alignment.TopStart)
.padding(start = 8.dp)
) {
Icon(
imageVector = Icons.Filled.ArrowBack,
Expand Down Expand Up @@ -204,7 +206,7 @@ fun ItemDetails(
)
.padding(PaddingValues(8.dp))
.size(20.dp),
style = MaterialTheme.typography.bodySmall,
style = TextStyle(color = Color.White),
textAlign = TextAlign.Center
)
}
Expand Down

0 comments on commit 4e73074

Please sign in to comment.