Skip to content

Commit

Permalink
fixed pagination
Browse files Browse the repository at this point in the history
  • Loading branch information
@BeamlakAschalew
BeamlakAschalew committed Feb 17, 2024
1 parent 2053b3c commit 111066c
Show file tree
Hide file tree
Showing 5 changed files with 45 additions and 35 deletions.
26 changes: 19 additions & 7 deletions android/app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,12 @@ apply plugin: 'kotlin-android'
apply plugin: 'com.google.gms.google-services'
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"

def keystoreProperties = new Properties()
def keystorePropertiesFile = rootProject.file('key.properties')
if (keystorePropertiesFile.exists()) {
keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
}

android {
compileSdkVersion 32

Expand All @@ -52,13 +58,19 @@ android {
multiDexEnabled true
}

buildTypes {
release {
// TODO: Add your own signing config for the release build.
// Signing with the debug keys for now, so `flutter run --release` works.
signingConfig signingConfigs.debug
}
}
signingConfigs {
release {
keyAlias keystoreProperties['keyAlias']
keyPassword keystoreProperties['keyPassword']
storeFile keystoreProperties['storeFile'] ? file(keystoreProperties['storeFile']) : null
storePassword keystoreProperties['storePassword']
}
}
buildTypes {
release {
signingConfig signingConfigs.release
}
}
}

flutter {
Expand Down
34 changes: 16 additions & 18 deletions lib/api/endpoints.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,34 +23,32 @@ class Endpoints {
return '$TMDB_API_BASE_URL/movie/$id/credits?api_key=$TMDB_API_KEY&language=$l';
}

static String topRatedUrl(int page, String l) {
static String topRatedUrl(String l) {
return '$TMDB_API_BASE_URL'
'/movie/top_rated?api_key='
'$TMDB_API_KEY'
'&page=$page'
'&region=US&language=$l';
}

static String popularMoviesUrl(int page, String l) {
static String popularMoviesUrl(String l) {
return '$TMDB_API_BASE_URL'
'/movie/popular?api_key='
'$TMDB_API_KEY'
'&page=$page&language=$l';
'&language=$l';
}

static String trendingMoviesUrl(int page, bool includeAdult, String l) {
static String trendingMoviesUrl(bool includeAdult, String l) {
return '$TMDB_API_BASE_URL'
'/trending/movie/week?api_key='
'$TMDB_API_KEY'
'&page=$page'
'&include_adult=$includeAdult&language=$l';
}

static String upcomingMoviesUrl(int page, String l) {
static String upcomingMoviesUrl(String l) {
return '$TMDB_API_BASE_URL'
'/movie/upcoming?api_key='
'$TMDB_API_KEY'
'&page=$page&language=$l';
'&language=$l';
}

static String movieDetailsUrl(int movieId, String l) {
Expand Down Expand Up @@ -162,29 +160,29 @@ class Endpoints {
'/discover/tv?api_key=$TMDB_API_KEY&language=$l&sort_by=popularity.desc&page=$page';
}

static popularTVUrl(int page, String l) {
static popularTVUrl(String l) {
return '$TMDB_API_BASE_URL'
'/tv/popular?api_key=$TMDB_API_KEY&language=$l&page=$page';
'/tv/popular?api_key=$TMDB_API_KEY&language=$l';
}

static trendingTVUrl(int page, String l) {
static trendingTVUrl(String l) {
return '$TMDB_API_BASE_URL'
'/trending/tv/week?api_key=$TMDB_API_KEY&page=$page&language=$l';
'/trending/tv/week?api_key=$TMDB_API_KEY&language=$l';
}

static topRatedTVUrl(int page, String l) {
static topRatedTVUrl(String l) {
return '$TMDB_API_BASE_URL'
'/tv/top_rated?api_key=$TMDB_API_KEY&language=$l&page=$page';
'/tv/top_rated?api_key=$TMDB_API_KEY&language=$l';
}

static airingTodayUrl(int page, String l) {
static airingTodayUrl(String l) {
return '$TMDB_API_BASE_URL'
'/tv/airing_today?api_key=$TMDB_API_KEY&language=$l&page=$page';
'/tv/airing_today?api_key=$TMDB_API_KEY&language=$l';
}

static onTheAirUrl(int page, String l) {
static onTheAirUrl(String l) {
return '$TMDB_API_BASE_URL'
'/tv/on_the_air?api_key=$TMDB_API_KEY&language=$l&page=$page';
'/tv/on_the_air?api_key=$TMDB_API_KEY&language=$l';
}

static getFullTVCreditsUrl(int id, String l) {
Expand Down
2 changes: 1 addition & 1 deletion lib/functions/network.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import '../models/live_tv.dart';

Future<List<Movie>> fetchMovies(String api) async {
MovieList movieList;

try {
var res = await retryOptions.retry(
(() => http.get(Uri.parse(api)).timeout(timeOut)),
Expand Down
8 changes: 4 additions & 4 deletions lib/widgets/movie_widgets.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ class _MainMoviesDisplayState extends State<MainMoviesDisplay> {
const UpdateBottom(),
ScrollingMovies(
title: tr("popular"),
api: Endpoints.popularMoviesUrl(1, lang),
api: Endpoints.popularMoviesUrl(lang),
discoverType: 'popular',
isTrending: false,
includeAdult: includeAdult,
Expand All @@ -77,14 +77,14 @@ class _MainMoviesDisplayState extends State<MainMoviesDisplay> {
: ScrollingRecentMovies(moviesList: rMovies),
ScrollingMovies(
title: tr("trending_this_week"),
api: Endpoints.trendingMoviesUrl(1, includeAdult, lang),
api: Endpoints.trendingMoviesUrl(includeAdult, lang),
discoverType: 'Trending',
isTrending: true,
includeAdult: includeAdult,
),
ScrollingMovies(
title: tr("top_rated"),
api: Endpoints.topRatedUrl(1, lang),
api: Endpoints.topRatedUrl(lang),
discoverType: 'top_rated',
isTrending: false,
includeAdult: includeAdult,
Expand All @@ -98,7 +98,7 @@ class _MainMoviesDisplayState extends State<MainMoviesDisplay> {
),
ScrollingMovies(
title: tr("upcoming"),
api: Endpoints.upcomingMoviesUrl(1, lang),
api: Endpoints.upcomingMoviesUrl(lang),
discoverType: 'upcoming',
isTrending: false,
includeAdult: includeAdult,
Expand Down
10 changes: 5 additions & 5 deletions lib/widgets/tv_widgets.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ class _MainTVDisplayState extends State<MainTVDisplay> {
ScrollingTV(
includeAdult: Provider.of<SettingsProvider>(context).isAdult,
title: tr("popular"),
api: Endpoints.popularTVUrl(1, lang),
api: Endpoints.popularTVUrl(lang),
discoverType: 'popular',
isTrending: false,
),
Expand All @@ -90,28 +90,28 @@ class _MainTVDisplayState extends State<MainTVDisplay> {
ScrollingTV(
includeAdult: Provider.of<SettingsProvider>(context).isAdult,
title: tr("trending_this_week"),
api: Endpoints.trendingTVUrl(1, lang),
api: Endpoints.trendingTVUrl(lang),
discoverType: 'trending',
isTrending: true,
),
ScrollingTV(
includeAdult: Provider.of<SettingsProvider>(context).isAdult,
title: tr("top_rated"),
api: Endpoints.topRatedTVUrl(1, lang),
api: Endpoints.topRatedTVUrl(lang),
discoverType: 'top_rated',
isTrending: false,
),
ScrollingTV(
includeAdult: Provider.of<SettingsProvider>(context).isAdult,
title: tr("airing_today"),
api: Endpoints.airingTodayUrl(1, lang),
api: Endpoints.airingTodayUrl(lang),
discoverType: 'airing_today',
isTrending: false,
),
ScrollingTV(
includeAdult: Provider.of<SettingsProvider>(context).isAdult,
title: tr("on_the_air"),
api: Endpoints.onTheAirUrl(1, lang),
api: Endpoints.onTheAirUrl(lang),
discoverType: 'on_the_air',
isTrending: false,
),
Expand Down

0 comments on commit 111066c

Please sign in to comment.