Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
a688bb3
Added backAPI, changed firebase code, changed UI
droidLight Feb 2, 2020
27ad8c8
UI changes, moved images to firebase
droidLight Feb 3, 2020
615be18
updated Event rules
droidLight Feb 3, 2020
b0050b4
fixed login UI, removed unwanted assets, made DSC logo to local
droidLight Feb 3, 2020
46b57d5
Migrated to Androidx
kavinraju Feb 3, 2020
fe52c81
Added Feebback, Share in menu.
kavinraju Feb 4, 2020
766917e
commiting changes
droidLight Feb 4, 2020
cd92159
Merge branch 'master' of https://github.com/droidLight/Colosseum_2k19
droidLight Feb 4, 2020
f1d2eec
Fixed few UI bugs
kavinraju Feb 4, 2020
045e6a0
integrated date api
droidLight Feb 4, 2020
1a6ad18
added assets
droidLight Feb 4, 2020
481adb6
Merge branch 'master' of https://github.com/droidLight/Colosseum_2k19
droidLight Feb 4, 2020
b24cfca
fixed crashes
droidLight Feb 4, 2020
cd24d91
Added Social Medias in About Us
kavinraju Feb 4, 2020
2b9ea32
Merge remote-tracking branch 'origin/master'
kavinraju Feb 4, 2020
da0f273
fixed assets memory issue
droidLight Feb 4, 2020
38e3492
Merge branch 'master' of https://github.com/droidLight/Colosseum_2k19
droidLight Feb 4, 2020
86da5e4
added progress bar in login
droidLight Feb 4, 2020
a6409c2
Added dialer intents, changed assets
droidLight Feb 5, 2020
854046c
fixed fixtures bug
droidLight Feb 5, 2020
22482e4
fixed score bug
droidLight Feb 5, 2020
451faa5
modified scores, added strings, frag_about changes of kavin
droidLight Feb 6, 2020
a9a9321
sorting fixtures and scores
droidLight Feb 6, 2020
6cc831f
fixed sorting in fixtures
droidLight Feb 6, 2020
5759e2c
Update strings.xml
droidLight Feb 6, 2020
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
46 changes: 46 additions & 0 deletions .idea/assetWizardSettings.xml

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

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.

12 changes: 8 additions & 4 deletions .idea/misc.xml

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

49 changes: 28 additions & 21 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,52 +1,59 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 28
compileSdkVersion 29
defaultConfig {
applicationId "colosseum19.a300dpi.colosseum2k19"
minSdkVersion 21
targetSdkVersion 28
versionCode 4
versionName "1.11"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
targetSdkVersion 29
versionCode 8
versionName "2.0"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
buildTypes {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
}

dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation 'com.android.support:appcompat-v7:28.0.0'
implementation 'com.android.support.constraint:constraint-layout:1.1.3'
implementation 'com.android.support:design:28.0.0'
implementation 'androidx.appcompat:appcompat:1.1.0'
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
implementation 'com.google.android.material:material:1.0.0'
testImplementation 'junit:junit:4.12'
androidTestImplementation 'com.android.support.test:runner:1.0.2'
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
androidTestImplementation 'androidx.test.ext:junit:1.1.1'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'

// Add your dependencies under here
implementation 'com.android.support:cardview-v7:28.0.0'
implementation 'com.android.support:recyclerview-v7:28.0.0'
implementation 'androidx.cardview:cardview:1.0.0'
implementation 'androidx.recyclerview:recyclerview:1.1.0'
//Butterknife dependencies
implementation 'com.jakewharton:butterknife:8.8.1'
annotationProcessor 'com.jakewharton:butterknife-compiler:8.8.1'
implementation 'com.jakewharton:butterknife:10.2.1'
annotationProcessor 'com.jakewharton:butterknife-compiler:10.2.1'
//Glide dependencies
implementation 'com.github.bumptech.glide:glide:4.8.0'
implementation 'com.github.bumptech.glide:glide:4.9.0'
annotationProcessor 'com.github.bumptech.glide:compiler:4.8.0'
//Firebase
implementation 'com.google.firebase:firebase-firestore:18.0.0'
implementation 'com.google.firebase:firebase-auth:16.1.0'
implementation 'com.google.android.gms:play-services-auth:16.0.1'
implementation 'com.google.firebase:firebase-firestore:21.3.1'
implementation 'com.google.firebase:firebase-auth:19.2.0'
implementation 'com.google.android.gms:play-services-auth:17.0.0'
//progress dialog
implementation 'com.github.d-max:spots-dialog:1.1@aar'
//firebase messaging
implementation 'com.google.firebase:firebase-messaging:17.3.4'
implementation 'com.google.firebase:firebase-messaging:20.1.0'
//in app messaging
implementation 'com.google.firebase:firebase-inappmessaging-display:17.0.5'
implementation 'com.google.firebase:firebase-core:16.0.6'
implementation 'com.google.firebase:firebase-inappmessaging-display:19.0.3'
implementation 'com.google.firebase:firebase-core:17.2.2'
//http library
implementation 'com.android.volley:volley:1.1.1'

}
apply plugin: 'com.google.gms.google-services'
Loading