Skip to content

Commit

Permalink
Gradle bump
Browse files Browse the repository at this point in the history
  • Loading branch information
webianks committed Oct 11, 2017
1 parent e9c12f0 commit e3e6240
Show file tree
Hide file tree
Showing 7 changed files with 82 additions and 36 deletions.
2 changes: 1 addition & 1 deletion .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

47 changes: 24 additions & 23 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,13 @@ apply plugin: 'io.fabric'

repositories {
maven { url 'https://maven.fabric.io/public' }
google()
}


android {
compileSdkVersion 25
buildToolsVersion "25.0.2"
compileSdkVersion 26
buildToolsVersion '26.0.2'

defaultConfig {
applicationId "tech.salroid.filmy"
Expand Down Expand Up @@ -46,39 +47,39 @@ android {
}
}

def getTMDBApiKey(){
static def getTMDBApiKey(){
def Properties props = new Properties()
props.load(new FileInputStream(new File('secrets.properties')))
return props['TMDB_API_KEY']
}

def getOMDBApiKey(){
static def getOMDBApiKey(){
def Properties props = new Properties()
props.load(new FileInputStream(new File('secrets.properties')))
return props['OMDB_API_KEY']
}

dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
compile 'com.android.support:appcompat-v7:25.3.1'
compile 'com.android.support:design:25.3.1'
compile 'com.android.support:customtabs:25.3.1'
compile 'com.github.bumptech.glide:glide:3.7.0'
compile 'com.mcxiaoke.volley:library:1.0.19'
compile 'com.mikhaellopez:circularimageview:3.0.2'
compile 'com.android.support:palette-v7:25.3.1'
compile 'com.miguelcatalan:materialsearchview:1.4.0'
compile 'com.android.support:cardview-v7:25.3.1'
testCompile 'junit:junit:4.12'
compile 'me.tatarka.support:jobscheduler:0.1.1'
compile 'com.github.xiprox.errorview:library:2.+'
compile 'com.github.paolorotolo:appintro:4.0.0'
compile('com.crashlytics.sdk.android:crashlytics:2.6.7@aar') {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation 'com.android.support:appcompat-v7:26.1.0'
implementation 'com.android.support:design:26.1.0'
implementation 'com.android.support:customtabs:26.1.0'
implementation 'com.github.bumptech.glide:glide:3.7.0'
implementation 'com.mcxiaoke.volley:library:1.0.19'
implementation 'com.mikhaellopez:circularimageview:3.0.2'
implementation 'com.android.support:palette-v7:26.1.0'
implementation 'com.miguelcatalan:materialsearchview:1.4.0'
implementation 'com.android.support:cardview-v7:26.1.0'
testImplementation 'junit:junit:4.12'
implementation 'me.tatarka.support:jobscheduler:0.1.1'
implementation 'com.github.xiprox.errorview:library:2.+'
implementation 'com.github.paolorotolo:appintro:4.0.0'
implementation('com.crashlytics.sdk.android:crashlytics:2.6.7@aar') {
transitive = true;
}
compile 'com.jakewharton:butterknife:8.6.0'
implementation 'com.jakewharton:butterknife:8.6.0'
annotationProcessor 'com.jakewharton:butterknife-compiler:8.6.0'
compile 'com.google.firebase:firebase-appindexing:10.0.0'
compile files('libs/YouTubeAndroidPlayerApi.jar')
debugCompile 'com.amitshekhar.android:debug-db:1.0.0'
implementation 'com.google.firebase:firebase-appindexing:11.4.2'
implementation files('libs/YouTubeAndroidPlayerApi.jar')
debugImplementation 'com.amitshekhar.android:debug-db:1.0.0'
}
Original file line number Diff line number Diff line change
@@ -1,72 +1,115 @@
package tech.salroid.filmy.customs;

import android.support.v7.widget.GridLayoutManager;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import android.support.v7.widget.StaggeredGridLayoutManager;


public abstract class RecyclerviewEndlessScrollListener extends RecyclerView.OnScrollListener {

// The minimum amount of items to have below your current scroll position
// before loading more.
private int visibleThreshold = 5;
// The current offset index of data you have loaded
private int currentPage = 0;
// The total number of items in the dataset after the last load
private int previousTotalItemCount = 0;
// True if we are still waiting for the last set of data to load.
private boolean loading = true;
// Sets the starting page index
private int startingPageIndex = 0;

RecyclerView.LayoutManager mLayoutManager;

public RecyclerviewEndlessScrollListener(StaggeredGridLayoutManager layoutManager) {
public RecyclerviewEndlessScrollListener(LinearLayoutManager layoutManager) {
this.mLayoutManager = layoutManager;
}

public int getLastVisibleItem(int[] lastVisibleItemPositions) {
public RecyclerviewEndlessScrollListener(GridLayoutManager layoutManager) {
this.mLayoutManager = layoutManager;
visibleThreshold = 2;
}

protected RecyclerviewEndlessScrollListener(StaggeredGridLayoutManager layoutManager) {
this.mLayoutManager = layoutManager;
visibleThreshold = visibleThreshold * layoutManager.getSpanCount();
}

private int getLastVisibleItem(int[] lastVisibleItemPositions) {
int maxSize = 0;
for (int i = 0; i < lastVisibleItemPositions.length; i++) {
if (i == 0) {
maxSize = lastVisibleItemPositions[i];
}
else if (lastVisibleItemPositions[i] > maxSize) {
} else if (lastVisibleItemPositions[i] > maxSize) {
maxSize = lastVisibleItemPositions[i];
}
}
return maxSize;
}

// This happens many times a second during a scroll, so be wary of the code you place here.
// We are given a few useful parameters to help us work out if we need to load some more data,
// but first we check if we are waiting for the previous load to finish.
@Override
public void onScrolled(RecyclerView view, int dx, int dy) {

//Log.d("", "onScrolled: "+dx+" "+dy);

int lastVisibleItemPosition = 0;
int totalItemCount = mLayoutManager.getItemCount();

if (mLayoutManager instanceof LinearLayoutManager) {
lastVisibleItemPosition = ((LinearLayoutManager) mLayoutManager).findLastVisibleItemPosition();
if (mLayoutManager instanceof StaggeredGridLayoutManager) {
int[] lastVisibleItemPositions = ((StaggeredGridLayoutManager) mLayoutManager).findLastVisibleItemPositions(null);
// get maximum element within the list
lastVisibleItemPosition = getLastVisibleItem(lastVisibleItemPositions);
} else if (mLayoutManager instanceof GridLayoutManager) {
lastVisibleItemPosition = ((GridLayoutManager) mLayoutManager).findLastVisibleItemPosition();
} else if (mLayoutManager instanceof LinearLayoutManager) {
lastVisibleItemPosition = ((LinearLayoutManager) mLayoutManager).findLastVisibleItemPosition();
}


// If the total item count is zero and the previous isn't, assume the
// list is invalidated and should be reset back to initial state
if (totalItemCount < previousTotalItemCount) {
this.currentPage = this.startingPageIndex;
this.previousTotalItemCount = totalItemCount;
if (totalItemCount == 0) {
this.loading = true;
}
}

// If it’s still loading, we check to see if the dataset count has
// changed, if so we conclude it has finished loading and update the current page
// number and total item count.
if (loading && (totalItemCount > previousTotalItemCount)) {
loading = false;
previousTotalItemCount = totalItemCount;
}

// If it isn’t currently loading, we check to see if we have breached
// the visibleThreshold and need to reload more data.
// If we do need to reload some more data, we execute onLoadMore to fetch the data.
// threshold should reflect how many total columns there are too
if (!loading && (lastVisibleItemPosition + visibleThreshold) > totalItemCount) {
currentPage++;
onLoadMore(currentPage, totalItemCount, view);
loading = true;
}
}

// Call this method whenever performing new searches
public void resetState() {
this.currentPage = this.startingPageIndex;
this.previousTotalItemCount = 0;
this.loading = true;
}

public void setCurrentPage(int page) {
this.currentPage = page;
}

// Defines the process for actually loading more data based on page
public abstract void onLoadMore(int page, int totalItemsCount, RecyclerView view);

}
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
@Override
public void onLoadMore(int page, int totalItemsCount, RecyclerView view) {
moreProgress.setVisibility(View.VISIBLE);
Log.d("webi","Load more called.");
}
});

Expand Down
4 changes: 2 additions & 2 deletions app/src/main/res/layout/fragment_trending.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@
android:layout_width="match_parent"
android:layout_height="21dp"
android:layout_gravity="bottom"
android:visibility="gone"
android:layout_marginBottom="-9dp"
android:indeterminate="true" />
android:indeterminate="true"
android:visibility="gone" />


</FrameLayout>
Expand Down
3 changes: 2 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@
buildscript {
repositories {
jcenter()
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:2.3.1'
classpath 'com.android.tools.build:gradle:3.0.0-beta7'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
}
Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Fri Jun 23 08:30:12 IST 2017
#Tue Oct 10 22:17:55 IST 2017
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-3.4.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip

0 comments on commit e3e6240

Please sign in to comment.