Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,4 @@
/build
/captures
.externalNativeBuild
/app/google-services.json
Binary file modified .idea/caches/gradle_models.ser
Binary file not shown.
134 changes: 109 additions & 25 deletions .idea/codeStyles/Project.xml

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

10 changes: 7 additions & 3 deletions .idea/misc.xml

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

11 changes: 9 additions & 2 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ android {
applicationId "colosseum19.a300dpi.colosseum2k19"
minSdkVersion 21
targetSdkVersion 28
versionCode 4
versionName "1.11"
versionCode 5
versionName "1.12"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
}
buildTypes {
Expand Down Expand Up @@ -45,5 +45,12 @@ dependencies {
//firebase messaging
implementation 'com.google.firebase:firebase-messaging:17.3.4'

//Room arch
def lifecycle_version = "1.1.1"
implementation "android.arch.persistence.room:runtime:$lifecycle_version"
annotationProcessor "android.arch.persistence.room:compiler:$lifecycle_version"
implementation "android.arch.lifecycle:extensions:$lifecycle_version"
annotationProcessor "android.arch.lifecycle:compiler:$lifecycle_version"

}
apply plugin: 'com.google.gms.google-services'
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ public void addEvent(Fixture fixture){
fixtureList.add(fixture);
}

public void setData(ArrayList<Fixture> data){
public void setData(List<Fixture> data) {
this.fixtureList = data;
notifyDataSetChanged();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
import android.widget.Toast;

import java.util.ArrayList;
import java.util.List;

import colosseum19.a300dpi.colosseum2k19.Fragments.FixturesFragment;
import colosseum19.a300dpi.colosseum2k19.Interfaces.CallbackInterface;
Expand Down Expand Up @@ -113,7 +114,7 @@ public void callback(String queryGame) {
}

@Override
public void setFixtureData(ArrayList<Fixture> data, GameHolder gameHolder,boolean isempty) {
public void setFixtureData(List<Fixture> data, GameHolder gameHolder, boolean isempty) {
if(isempty){
progressDialog.cancel();
Toast.makeText(ctx,ctx.getString(R.string.not_updated),Toast.LENGTH_SHORT).show();
Expand All @@ -124,7 +125,7 @@ public void setFixtureData(ArrayList<Fixture> data, GameHolder gameHolder,boolea
}

@Override
public void setScoreData(ArrayList<Score> data, ScoreGameListAdapter.ScoreGameHolder gameHolder, boolean isEmpty) {
public void setScoreData(List<Score> data, ScoreGameListAdapter.ScoreGameHolder gameHolder, boolean isEmpty) {

}

Expand All @@ -151,7 +152,7 @@ public GameHolder(@NonNull View itemView) {

}

public void setRecyclerView(ArrayList<Fixture>data){
public void setRecyclerView(List<Fixture> data) {
specificGameList.setVisibility(View.VISIBLE);
adapter.setData(data);
progressDialog.cancel();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,15 @@
import android.widget.TextView;

import java.util.ArrayList;
import java.util.List;

import colosseum19.a300dpi.colosseum2k19.Model.Score;
import colosseum19.a300dpi.colosseum2k19.R;

public class ScoreAdapter extends RecyclerView.Adapter<ScoreAdapter.ScoreHolder> {

private Context ctx;
private ArrayList<Score> points = new ArrayList<>();
private List<Score> points = new ArrayList<>();

public ScoreAdapter(Context ctx) {
this.ctx = ctx;
Expand All @@ -38,7 +39,7 @@ public ScoreHolder onCreateViewHolder(ViewGroup parent, int viewType) {
return new ScoreHolder(view);
}

public void setScores(ArrayList<Score> scoresList) {
public void setScores(List<Score> scoresList) {
this.points = scoresList;
notifyDataSetChanged();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
import android.widget.Toast;

import java.util.ArrayList;
import java.util.List;

import colosseum19.a300dpi.colosseum2k19.Fragments.ScoresFragment;
import colosseum19.a300dpi.colosseum2k19.Interfaces.CallbackInterface;
Expand Down Expand Up @@ -106,7 +107,7 @@ private String getQueryWord(String gameName){

//callback containing score of specific game
@Override
public void setScoreData(ArrayList<Score> data, ScoreGameHolder gameHolder,boolean isEmpty) {
public void setScoreData(List<Score> data, ScoreGameHolder gameHolder, boolean isEmpty) {
if(isEmpty){
progressDialog.cancel();
Toast.makeText(ctx,ctx.getString(R.string.not_updated),Toast.LENGTH_SHORT).show();
Expand Down Expand Up @@ -135,7 +136,7 @@ public ScoreGameHolder(@NonNull View itemView) {
gameScoreList.setLayoutManager(new LinearLayoutManager(ctx));
}

public void setRecyclerView(ArrayList<Score>data){
public void setRecyclerView(List<Score> data) {
gameScoreList.setVisibility(View.VISIBLE);
adapter.setScores(data);
progressDialog.cancel();
Expand All @@ -152,7 +153,7 @@ public void callback(String queryGame) {
}

@Override
public void setFixtureData(ArrayList<Fixture> data, FixtureGameListAdapter.GameHolder gameHolder,boolean isEmpty) {
public void setFixtureData(List<Fixture> data, FixtureGameListAdapter.GameHolder gameHolder, boolean isEmpty) {

}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
package colosseum19.a300dpi.colosseum2k19.Database;

import android.arch.lifecycle.LiveData;
import android.arch.persistence.room.Dao;
import android.arch.persistence.room.Insert;
import android.arch.persistence.room.Query;

import java.util.ArrayList;
import java.util.List;

@Dao
public interface ColosseumDao {

@Query("SELECT * FROM fixtures WHERE game_name = :game_name")
LiveData<List<FixtureEntry>> loadFixtures(String game_name);

@Query("SELECT * FROM scores WHERE game_name = :game_name")
LiveData<List<ScoreEntry>> loadScores(String game_name);

@Insert
void insertFixture(FixtureEntry fixtureEntry);

@Insert
void insertScore(ScoreEntry scoreEntry);

@Insert
void insertFixtures(List<FixtureEntry> fixtureEntryList);

@Insert
void insertScores(List<ScoreEntry> scoreEntries);

@Query("DELETE FROM fixtures")
void deleteFixtureTable();

@Query("DELETE FROM scores")
void deleteScoreTable();
}
Loading