From 5f2db2b8899cc577dc39b78708bbf2eb543d1c79 Mon Sep 17 00:00:00 2001 From: manojchawan Date: Wed, 30 Aug 2017 21:13:51 +0530 Subject: [PATCH 1/4] changed adapter_about_to_empty logic to randomly call next page. --- .../watchit/mainpage/view/MainFragment.java | 46 +++++++++++++++---- 1 file changed, 38 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/com/hussainmukadam/watchit/mainpage/view/MainFragment.java b/app/src/main/java/com/hussainmukadam/watchit/mainpage/view/MainFragment.java index f597113..33d922d 100644 --- a/app/src/main/java/com/hussainmukadam/watchit/mainpage/view/MainFragment.java +++ b/app/src/main/java/com/hussainmukadam/watchit/mainpage/view/MainFragment.java @@ -58,6 +58,7 @@ public class MainFragment extends Fragment implements MainMVPContract.View, View private Boolean isMovies; private int TOTAL_PAGES; private int currentPage = PAGE_START; + private Boolean isFirstFetch; @Nullable @Override @@ -94,7 +95,7 @@ public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, } private String getGenres() { - + isFirstFetch = true; if (isMovies) { List tempList = prefs.getMoviesGenrePreference(); if (tempList.size() != 0) { @@ -202,7 +203,7 @@ public void onLeftCardExit(Object dataObject) { //Do something on the left! //You also have access to the original object. //If you want to use it just cast it (String) dataObject - Log.d(TAG, "onLeftCardExit: dataObject " + dataObject.getClass().getSimpleName()); + // Log.d(TAG, "onLeftCardExit: dataObject " + dataObject.getClass().getSimpleName()); Movie movie = (Movie) dataObject; mainPresenter.storeMovieData(false, movie); } @@ -219,10 +220,10 @@ public void onAdapterAboutToEmpty(int itemsInAdapter) { // Ask for more data here Log.d(TAG, "onAdapterAboutToEmpty: ItemsInAdapter " + itemsInAdapter + " currentPage " + currentPage + " TOTAL PAGES " + TOTAL_PAGES); - if (itemsInAdapter == 0 && currentPage < TOTAL_PAGES) { + /*if (itemsInAdapter == 0 && currentPage < TOTAL_PAGES) { Log.d(TAG, "onAdapterAboutToEmpty: Inside if ItemsInAdapter " + itemsInAdapter + " currentPage " + currentPage + " TOTAL PAGES " + TOTAL_PAGES); - if(Util.isConnected(getContext())) { + if (Util.isConnected(getContext())) { currentPage++; mainPresenter.fetchNextPageMoviesByGenres(genresList, currentPage); } else { @@ -231,7 +232,28 @@ public void onAdapterAboutToEmpty(int itemsInAdapter) { } else if (itemsInAdapter == 0 && currentPage == TOTAL_PAGES) { Log.d(TAG, "onAdapterAboutToEmpty: Inside else"); - if(Util.isConnected(getContext())) { + if (Util.isConnected(getContext())) { + currentPage = PAGE_START; + mainPresenter.fetchFirstPageMoviesByGenres(getGenres(), currentPage); + } else { + Toast.makeText(getContext(), "No Internet Connection", Toast.LENGTH_SHORT).show(); + } + }*/ + + if (itemsInAdapter == 0 && currentPage < TOTAL_PAGES && isFirstFetch) { + Log.d(TAG, "onAdapterAboutToEmpty: Inside if ItemsInAdapter " + itemsInAdapter + " currentPage " + currentPage + " TOTAL PAGES " + TOTAL_PAGES); + + if (Util.isConnected(getContext())) { + currentPage = getPage(TOTAL_PAGES); + isFirstFetch = false; + mainPresenter.fetchNextPageMoviesByGenres(genresList, currentPage); + } else { + Toast.makeText(getContext(), "No Internet Connection", Toast.LENGTH_SHORT).show(); + } + } else if (itemsInAdapter == 0) { + Log.d(TAG, "onAdapterAboutToEmpty: Inside else"); + + if (Util.isConnected(getContext())) { currentPage = PAGE_START; mainPresenter.fetchFirstPageMoviesByGenres(getGenres(), currentPage); } else { @@ -303,16 +325,17 @@ public void onAdapterAboutToEmpty(int itemsInAdapter) { // Ask for more data here Log.d(TAG, "onAdapterAboutToEmpty: ItemsInAdapter " + itemsInAdapter + " currentPage " + currentPage + " TOTAL PAGES " + TOTAL_PAGES); - if (itemsInAdapter == 0 && currentPage < TOTAL_PAGES) { + if (itemsInAdapter == 0 && currentPage < TOTAL_PAGES && isFirstFetch) { Log.d(TAG, "onAdapterAboutToEmpty: Inside if ItemsInAdapter " + itemsInAdapter + " currentPage " + currentPage + " TOTAL PAGES " + TOTAL_PAGES); if (Util.isConnected(getContext())) { - currentPage++; + currentPage = getPage(TOTAL_PAGES); + isFirstFetch = false; mainPresenter.fetchNextPageTvSeriesByGenres(genresList, currentPage); } else { Toast.makeText(getContext(), "No Internet Connection", Toast.LENGTH_SHORT).show(); } - } else if (itemsInAdapter == 0 && currentPage == TOTAL_PAGES) { + } else if (itemsInAdapter == 0 ) { Log.d(TAG, "onAdapterAboutToEmpty: Inside else"); if (Util.isConnected(getContext())) { @@ -343,6 +366,13 @@ public void onItemClicked(int itemPosition, Object dataObject) { }); } + private int getPage(int totalPage) { + Random random = new Random(); + int n = random.nextInt(totalPage) + 1; + Log.d(TAG, " NextPageNo: " + n); + return n; + } + @Override public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { super.onCreateOptionsMenu(menu, inflater); From f2db06bb6d8e5321cb9a5324bfae6565b5aa4e5a Mon Sep 17 00:00:00 2001 From: manojchawan Date: Wed, 30 Aug 2017 21:17:16 +0530 Subject: [PATCH 2/4] changed adapter_about_to_empty logic to randomly call next page. --- .../watchit/mainpage/view/MainFragment.java | 20 ------------------- 1 file changed, 20 deletions(-) diff --git a/app/src/main/java/com/hussainmukadam/watchit/mainpage/view/MainFragment.java b/app/src/main/java/com/hussainmukadam/watchit/mainpage/view/MainFragment.java index 33d922d..00c2b61 100644 --- a/app/src/main/java/com/hussainmukadam/watchit/mainpage/view/MainFragment.java +++ b/app/src/main/java/com/hussainmukadam/watchit/mainpage/view/MainFragment.java @@ -220,26 +220,6 @@ public void onAdapterAboutToEmpty(int itemsInAdapter) { // Ask for more data here Log.d(TAG, "onAdapterAboutToEmpty: ItemsInAdapter " + itemsInAdapter + " currentPage " + currentPage + " TOTAL PAGES " + TOTAL_PAGES); - /*if (itemsInAdapter == 0 && currentPage < TOTAL_PAGES) { - Log.d(TAG, "onAdapterAboutToEmpty: Inside if ItemsInAdapter " + itemsInAdapter + " currentPage " + currentPage + " TOTAL PAGES " + TOTAL_PAGES); - - if (Util.isConnected(getContext())) { - currentPage++; - mainPresenter.fetchNextPageMoviesByGenres(genresList, currentPage); - } else { - Toast.makeText(getContext(), "No Internet Connection", Toast.LENGTH_SHORT).show(); - } - } else if (itemsInAdapter == 0 && currentPage == TOTAL_PAGES) { - Log.d(TAG, "onAdapterAboutToEmpty: Inside else"); - - if (Util.isConnected(getContext())) { - currentPage = PAGE_START; - mainPresenter.fetchFirstPageMoviesByGenres(getGenres(), currentPage); - } else { - Toast.makeText(getContext(), "No Internet Connection", Toast.LENGTH_SHORT).show(); - } - }*/ - if (itemsInAdapter == 0 && currentPage < TOTAL_PAGES && isFirstFetch) { Log.d(TAG, "onAdapterAboutToEmpty: Inside if ItemsInAdapter " + itemsInAdapter + " currentPage " + currentPage + " TOTAL PAGES " + TOTAL_PAGES); From ac7354f92198dbefb01b3d7cd578500f15adcf6c Mon Sep 17 00:00:00 2001 From: manojchawan Date: Sat, 14 Oct 2017 20:06:10 +0530 Subject: [PATCH 3/4] call random genre with random page everytime --- app/build.gradle | 2 +- app/src/main/AndroidManifest.xml | 2 +- .../watchit/mainpage/MainMVPContract.java | 4 +- .../mainpage/presenter/MainPresenter.java | 50 +++++++++++------ .../watchit/mainpage/view/MainFragment.java | 53 ++++++++++++++----- 5 files changed, 79 insertions(+), 32 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index b156150..2aa1aad 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -48,7 +48,7 @@ android { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' buildConfigField 'String', 'baseUrl', '"https://api.themoviedb.org/3/"' - buildConfigField 'String', 'apiKey', '""' + buildConfigField 'String', 'apiKey', '"07ebecba1d66dde4bda8ea1a0abbc436"' buildConfigField 'String', 'imageBaseUrl', '"http://image.tmdb.org/t/p/w342/"' } release { diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index a359ccf..3dcf206 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -28,7 +28,7 @@ + android:value="cad2e1b22dcd58a17cd2c8ee4f2d7dcc10f48a85" /> diff --git a/app/src/main/java/com/hussainmukadam/watchit/mainpage/MainMVPContract.java b/app/src/main/java/com/hussainmukadam/watchit/mainpage/MainMVPContract.java index 91f21b9..33326bd 100644 --- a/app/src/main/java/com/hussainmukadam/watchit/mainpage/MainMVPContract.java +++ b/app/src/main/java/com/hussainmukadam/watchit/mainpage/MainMVPContract.java @@ -21,11 +21,11 @@ interface View extends BaseView{ void displayFirstPageMovies(List movieList, int totalPages); - void displayNextPageMovies(List movieList); + void displayNextPageMovies(List movieList, int totalPages); void displayFirstPageTvSeries(List tvSeriesList, int totalPages); - void displayNextPageTvSeries(List tvSeriesList); + void displayNextPageTvSeries(List tvSeriesList, int totalPages); void showMovieResponseError(String errorMessage); diff --git a/app/src/main/java/com/hussainmukadam/watchit/mainpage/presenter/MainPresenter.java b/app/src/main/java/com/hussainmukadam/watchit/mainpage/presenter/MainPresenter.java index 1ee45fb..92027bc 100644 --- a/app/src/main/java/com/hussainmukadam/watchit/mainpage/presenter/MainPresenter.java +++ b/app/src/main/java/com/hussainmukadam/watchit/mainpage/presenter/MainPresenter.java @@ -17,6 +17,7 @@ import java.util.ArrayList; import java.util.List; +import java.util.Random; import io.realm.Realm; import io.realm.RealmQuery; @@ -45,7 +46,7 @@ public void start() { } @Override - public void fetchFirstPageMoviesByGenres(String genreIdsByMovies, int pageNumber) { + public void fetchFirstPageMoviesByGenres(final String genreIdsByMovies, int pageNumber) { Log.d(TAG, "fetchMoviesBasedOnGenres: GenreIds " + genreIdsByMovies); @@ -59,6 +60,7 @@ public void fetchFirstPageMoviesByGenres(String genreIdsByMovies, int pageNumber public void onResponse(Call call, Response response) { List newMovieList = new ArrayList<>(); int totalPages = 0; + int nextPg = 0; Log.d(TAG, "onResponse: Response Code " + response.code()); if (response.isSuccessful()) { @@ -66,7 +68,13 @@ public void onResponse(Call call, Response respons mView.hideProgress(); totalPages = response.body().getTotalPages(); - realm = Realm.getDefaultInstance(); + //MANOJ'S CHANGES + Random random = new Random(); + nextPg = random.nextInt(totalPages) + 1; + Log.d(TAG, " NextPageNo: " + nextPg); + //END + + /* realm = Realm.getDefaultInstance(); RealmResults allMoviesResults = realm.where(Movie.class).findAll(); List existingMovieList = new ArrayList<>(allMoviesResults); @@ -80,7 +88,7 @@ public void onResponse(Call call, Response respons Log.d(TAG, "onResponse: Existing Movies List " + existingMovieList.size()); - Log.d(TAG, "onResponse: Movies List " + newMovieList.size()); + Log.d(TAG, "onResponse: Movies List " + newMovieList.size());*/ } else { mView.showMovieResponseError("Couldn't find any movies"); mView.hideProgress(); @@ -90,7 +98,8 @@ public void onResponse(Call call, Response respons mView.hideProgress(); } - mView.displayFirstPageMovies(newMovieList, totalPages); + // mView.displayFirstPageMovies(newMovieList, totalPages); + fetchNextPageMoviesByGenres(genreIdsByMovies, nextPg); } @Override @@ -105,7 +114,7 @@ public void onFailure(Call call, Throwable t) { @Override public void fetchNextPageMoviesByGenres(String genreIdsByMovies, int pageNumber) { - Log.d(TAG, "fetchNextPageMoviesByGenres: GenreIds " + genreIdsByMovies + "Page Number "+pageNumber); + Log.d(TAG, "fetchNextPageMoviesByGenres: GenreIds " + genreIdsByMovies + "Page Number " + pageNumber); mView.showProgress(); ApiInterface apiService = ApiClient.getClient().create(ApiInterface.class); @@ -115,13 +124,17 @@ public void fetchNextPageMoviesByGenres(String genreIdsByMovies, int pageNumber) @Override public void onResponse(Call call, Response response) { Log.d(TAG, "onResponse: Response Code " + response.code()); + int totalPages = 0; + if (response.isSuccessful()) { if (response.body().getMoviesList().size() != 0) { mView.hideProgress(); + totalPages = response.body().getTotalPages(); + realm = Realm.getDefaultInstance(); RealmResults allMoviesResults = realm.where(Movie.class).findAll(); - Log.d(TAG, "onResponse: Realm Data Stored "+allMoviesResults.size()); + Log.d(TAG, "onResponse: Realm Data Stored " + allMoviesResults.size()); List existingMovieList = new ArrayList<>(allMoviesResults); List newMovieList = response.body().getMoviesList(); @@ -132,7 +145,7 @@ public void onResponse(Call call, Response respons } } - mView.displayNextPageMovies(newMovieList); + mView.displayNextPageMovies(newMovieList, totalPages ); Log.d(TAG, "onResponse: Existing Movies List " + existingMovieList.size()); Log.d(TAG, "onResponse: Movies List " + newMovieList.size()); } else { @@ -189,13 +202,13 @@ public void execute(Realm realm) { @Override protected void onPostExecute(String result) { super.onPostExecute(result); - Log.d(TAG, "onPostExecute: Stored Movie Data "+result); + Log.d(TAG, "onPostExecute: Stored Movie Data " + result); } }.execute(); } @Override - public void fetchFirstPageTvSeriesByGenres(String genreIdByTv, int pageNumber) { + public void fetchFirstPageTvSeriesByGenres(final String genreIdByTv, int pageNumber) { Log.d(TAG, "fetchMoviesBasedOnGenres: GenreIds " + genreIdByTv); mView.showProgress(); ApiInterface apiService = ApiClient.getClient().create(ApiInterface.class); @@ -206,7 +219,7 @@ public void fetchFirstPageTvSeriesByGenres(String genreIdByTv, int pageNumber) { @Override public void onResponse(Call call, Response response) { List newTvList = new ArrayList<>(); - int totalPages = 0; + int totalPages, nextPg=0; Log.d(TAG, "onResponse: Response Code " + response.code()); if (response.isSuccessful()) { @@ -214,6 +227,10 @@ public void onResponse(Call call, Response response) { mView.hideProgress(); totalPages = response.body().getTotalPages(); + Random random = new Random(); + nextPg = random.nextInt(totalPages) + 1; + + /* realm = Realm.getDefaultInstance(); RealmResults allTvResults = realm.where(TvSeries.class).findAll(); @@ -229,6 +246,7 @@ public void onResponse(Call call, Response response) { Log.d(TAG, "onResponse: Existing Movies List " + existingTvList.size()); Log.d(TAG, "onResponse: Movies List " + newTvList.size()); + */ } else { mView.showTvSeriesResponseError("Couldn't find any tv series"); mView.hideProgress(); @@ -238,7 +256,8 @@ public void onResponse(Call call, Response response) { mView.hideProgress(); } - mView.displayFirstPageTvSeries(newTvList, totalPages); + //mView.displayFirstPageTvSeries(newTvList, totalPages); + fetchNextPageTvSeriesByGenres(genreIdByTv, nextPg); } @Override @@ -252,7 +271,7 @@ public void onFailure(Call call, Throwable t) { @Override public void fetchNextPageTvSeriesByGenres(String genreIdByTv, int pageNumber) { - Log.d(TAG, "fetchNextPageMoviesByGenres: GenreIds " + genreIdByTv + "Page Number "+pageNumber); + Log.d(TAG, "fetchNextPageMoviesByGenres: GenreIds " + genreIdByTv + "Page Number " + pageNumber); ApiInterface apiService = ApiClient.getClient().create(ApiInterface.class); @@ -264,10 +283,11 @@ public void onResponse(Call call, Response response) { Log.d(TAG, "onResponse: Response Code " + response.code()); if (response.isSuccessful()) { if (response.body().getTvList().size() != 0) { + int totalPages = response.body().getTotalPages(); realm = Realm.getDefaultInstance(); RealmResults allTvsResults = realm.where(TvSeries.class).findAll(); - Log.d(TAG, "onResponse: Realm Data Stored "+allTvsResults.size()); + Log.d(TAG, "onResponse: Realm Data Stored " + allTvsResults.size()); List existingTvList = new ArrayList<>(allTvsResults); List newTvList = response.body().getTvList(); @@ -278,7 +298,7 @@ public void onResponse(Call call, Response response) { } } - mView.displayNextPageTvSeries(newTvList); + mView.displayNextPageTvSeries(newTvList, totalPages); Log.d(TAG, "onResponse: Existing Tv List " + existingTvList.size()); Log.d(TAG, "onResponse: Tv List " + newTvList.size()); } else { @@ -332,7 +352,7 @@ public void execute(Realm realm) { @Override protected void onPostExecute(String result) { super.onPostExecute(result); - Log.d(TAG, "onPostExecute: Stored TV Data "+result); + Log.d(TAG, "onPostExecute: Stored TV Data " + result); } }.execute(); } diff --git a/app/src/main/java/com/hussainmukadam/watchit/mainpage/view/MainFragment.java b/app/src/main/java/com/hussainmukadam/watchit/mainpage/view/MainFragment.java index d0f8ac7..536d79c 100644 --- a/app/src/main/java/com/hussainmukadam/watchit/mainpage/view/MainFragment.java +++ b/app/src/main/java/com/hussainmukadam/watchit/mainpage/view/MainFragment.java @@ -58,7 +58,7 @@ public class MainFragment extends Fragment implements MainMVPContract.View, View private Boolean isMovies; private int TOTAL_PAGES; private int currentPage = PAGE_START; - private Boolean isFirstFetch; + //private Boolean isFirstFetch; @Nullable @Override @@ -95,7 +95,7 @@ public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, } private String getGenres() { - isFirstFetch = true; + // isFirstFetch = true; if (isMovies) { List tempList = prefs.getMoviesGenrePreference(); if (tempList.size() != 0) { @@ -220,7 +220,21 @@ public void onAdapterAboutToEmpty(int itemsInAdapter) { // Ask for more data here Log.d(TAG, "onAdapterAboutToEmpty: ItemsInAdapter " + itemsInAdapter + " currentPage " + currentPage + " TOTAL PAGES " + TOTAL_PAGES); - if (itemsInAdapter == 0 && currentPage < TOTAL_PAGES && isFirstFetch) { + + //MANOJ'S CHANGES + if (itemsInAdapter == 0) { + if (Util.isConnected(getContext())) { + currentPage = PAGE_START; + mainPresenter.fetchFirstPageMoviesByGenres(getGenres(), currentPage); + } else { + Toast.makeText(getContext(), "No Internet Connection", Toast.LENGTH_SHORT).show(); + } + } + //END + + + + /*if (itemsInAdapter == 0 && currentPage < TOTAL_PAGES && isFirstFetch) { Log.d(TAG, "onAdapterAboutToEmpty: Inside if ItemsInAdapter " + itemsInAdapter + " currentPage " + currentPage + " TOTAL PAGES " + TOTAL_PAGES); if (Util.isConnected(getContext())) { @@ -239,7 +253,7 @@ public void onAdapterAboutToEmpty(int itemsInAdapter) { } else { Toast.makeText(getContext(), "No Internet Connection", Toast.LENGTH_SHORT).show(); } - } + }*/ } @@ -305,7 +319,18 @@ public void onAdapterAboutToEmpty(int itemsInAdapter) { // Ask for more data here Log.d(TAG, "onAdapterAboutToEmpty: ItemsInAdapter " + itemsInAdapter + " currentPage " + currentPage + " TOTAL PAGES " + TOTAL_PAGES); - if (itemsInAdapter == 0 && currentPage < TOTAL_PAGES && isFirstFetch) { + //MANOJ'S CHANGES + if (itemsInAdapter == 0) { + if (Util.isConnected(getContext())) { + currentPage = PAGE_START; + mainPresenter.fetchFirstPageTvSeriesByGenres(getGenres(), currentPage); + } else { + Toast.makeText(getContext(), "No Internet Connection", Toast.LENGTH_SHORT).show(); + } + } + //END + + /*if (itemsInAdapter == 0 && currentPage < TOTAL_PAGES && isFirstFetch) { Log.d(TAG, "onAdapterAboutToEmpty: Inside if ItemsInAdapter " + itemsInAdapter + " currentPage " + currentPage + " TOTAL PAGES " + TOTAL_PAGES); if (Util.isConnected(getContext())) { @@ -315,7 +340,7 @@ public void onAdapterAboutToEmpty(int itemsInAdapter) { } else { Toast.makeText(getContext(), "No Internet Connection", Toast.LENGTH_SHORT).show(); } - } else if (itemsInAdapter == 0 ) { + } else if (itemsInAdapter == 0) { Log.d(TAG, "onAdapterAboutToEmpty: Inside else"); if (Util.isConnected(getContext())) { @@ -324,7 +349,7 @@ public void onAdapterAboutToEmpty(int itemsInAdapter) { } else { Toast.makeText(getContext(), "No Internet Connection", Toast.LENGTH_SHORT).show(); } - } + }*/ } @@ -346,13 +371,13 @@ public void onItemClicked(int itemPosition, Object dataObject) { }); } - private int getPage(int totalPage) { + /*private int getPage(int totalPage) { Random random = new Random(); int n = random.nextInt(totalPage) + 1; Log.d(TAG, " NextPageNo: " + n); return n; } - +*/ @Override public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { super.onCreateOptionsMenu(menu, inflater); @@ -380,8 +405,9 @@ public void displayFirstPageMovies(List movieList, int totalPages) { } @Override - public void displayNextPageMovies(List movieList) { + public void displayNextPageMovies(List movieList, int totalPages) { setupSwipeFlingAdapterViewForMovies(movieList); + this.TOTAL_PAGES = totalPages; } @Override @@ -391,14 +417,15 @@ public void displayFirstPageTvSeries(List tvSeriesList, int totalPages } @Override - public void displayNextPageTvSeries(List tvSeriesList) { + public void displayNextPageTvSeries(List tvSeriesList, int totalPages) { setupSwipeFlingAdapterViewForTv(tvSeriesList); + this.TOTAL_PAGES = totalPages; } @Override public void showMovieResponseError(String errorMessage) { Toast.makeText(getContext().getApplicationContext(), errorMessage, Toast.LENGTH_SHORT).show(); - if(Util.isConnected(getContext())) { + if (Util.isConnected(getContext())) { currentPage = PAGE_START; mainPresenter.fetchFirstPageMoviesByGenres(getGenres(), currentPage); } else { @@ -409,7 +436,7 @@ public void showMovieResponseError(String errorMessage) { @Override public void showTvSeriesResponseError(String errorMessage) { Toast.makeText(getContext().getApplicationContext(), errorMessage, Toast.LENGTH_SHORT).show(); - if(Util.isConnected(getContext())) { + if (Util.isConnected(getContext())) { currentPage = PAGE_START; mainPresenter.fetchFirstPageTvSeriesByGenres(getGenres(), currentPage); } else { From 53959f7569cdde8c8d3136f904c08fc1e08738c5 Mon Sep 17 00:00:00 2001 From: manojchawan Date: Sat, 20 Jan 2018 21:08:15 +0530 Subject: [PATCH 4/4] no changes --- app/src/main/AndroidManifest.xml | 3 +-- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index f1db5d7..9cc9a45 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -29,8 +29,7 @@ - + android:value="07ebecba1d66dde4bda8ea1a0abbc436" /> \ No newline at end of file diff --git a/build.gradle b/build.gradle index a5c369c..a01fb55 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.3.3' + classpath 'com.android.tools.build:gradle:3.0.1' classpath "io.realm:realm-gradle-plugin:3.5.0" // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 45ed301..a7b9d74 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Thu Jul 20 23:34:10 IST 2017 +#Sat Jan 20 20:55:03 IST 2018 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip