Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
282 commits
Select commit Hold shift + click to select a range
bcbd40a
Added google authentication
Nov 13, 2017
d0291a2
Finished google authentication
Nov 13, 2017
14c9905
Connection to the database being made, users can only access their ow…
Nov 13, 2017
f6f7416
added sign up screen
Nov 14, 2017
f676f1e
new login and sign up screens
Nov 14, 2017
2198dfd
Adding functionality for adding event
Nov 14, 2017
5049f97
Adding functionality for adding event
Nov 14, 2017
ab3163e
updated the login stuff
Nov 14, 2017
016f55c
Changed splash background
Nov 14, 2017
3fc37c3
Generate buttons programmatically
Nov 15, 2017
582ea9e
Using orignal firebase db
Nov 15, 2017
377a3f5
Using firestore
Nov 15, 2017
531705c
Merge branch 'dev' of https://github.com/hwhh/CMPS121GroupProject int…
Mattheo28 Nov 15, 2017
64226f3
Changed colour scheme
Nov 15, 2017
c2ac804
Added event page when button is clicked
Nov 15, 2017
2e625c7
Completed pin drop and add event form
Mattheo28 Nov 15, 2017
9f99a72
Added functionality to change duration of splash screen (2s right now)
Mattheo28 Nov 15, 2017
3f0c4ab
erge branch 'dev' of https://github.com/hwhh/CMPS121GroupProject into…
Mattheo28 Nov 15, 2017
dff21c3
Merge branch 'UIView' of https://github.com/hwhh/CMPS121GroupProject …
Mattheo28 Nov 15, 2017
1656536
Merge branch 'pin_drop' of https://github.com/hwhh/CMPS121GroupProjec…
Mattheo28 Nov 15, 2017
3a1a474
Refactored, changed some UI
Mattheo28 Nov 15, 2017
95b10da
Added TODO's, made splash screen shorter, started implementing event …
Mattheo28 Nov 15, 2017
1e03aa5
Added some db stuff but at dead end with list integration
Nov 15, 2017
49fa6a0
Merge branch 'RealTimeDB' of /Users/henryhargreaves/Documents/Univers…
Nov 15, 2017
4237799
merged
Nov 16, 2017
9f467d2
Merge branch 'RealTimeDB' of /Users/henryhargreaves/Documents/Univers…
Nov 16, 2017
509ac75
Merge branch 'Luke' of https://github.com/hwhh/CMPS121GroupProject in…
Mattheo28 Nov 16, 2017
f25eee9
Minor changes to add opening map on location
Mattheo28 Nov 16, 2017
05a7ed1
Merge branch 'Luke' of https://github.com/hwhh/CMPS121GroupProject in…
Mattheo28 Nov 16, 2017
b6d3625
Opening map on location done
Mattheo28 Nov 16, 2017
885ae4e
Passing event's location to the AddEventActivity
Mattheo28 Nov 16, 2017
69499f7
changed some stuff
Nov 16, 2017
9eec738
Changed layout for sign up page
Nov 16, 2017
94c7438
Added @ to null
Nov 16, 2017
4371003
Changed edit text layout
Nov 16, 2017
7dc0a3e
changed some stuff
Nov 16, 2017
981e31a
Merge branch 'RealTimeDB' of https://github.com/hwhh/CMPS121GroupProj…
Nov 16, 2017
1ab0587
Merge branch 'dev' into RealTimeDB
Nov 16, 2017
534d7ab
changed some stuff
Nov 16, 2017
bc71f7e
addd the event creation
Nov 16, 2017
eb80e56
addd the event creation
Nov 16, 2017
e2966ab
added new google client
Mattheo28 Nov 16, 2017
49e3ae1
fixing fcebook
Nov 16, 2017
4c20a8b
Merge branch 'RealTimeDB' of https://github.com/hwhh/CMPS121GroupProj…
Nov 16, 2017
0bebd1f
fixing some things
Nov 17, 2017
c6d9562
Updating the event listerner
Nov 17, 2017
6de4737
Events are being pulled from db
Nov 18, 2017
9260b3b
maps update in realtime
Nov 20, 2017
33babcb
added groups
Nov 20, 2017
4a5d77f
updating event page
Nov 21, 2017
74952c1
Temp change in build.gradle
Nov 21, 2017
c4b3e2d
updated the add event
Nov 21, 2017
79e29c3
updating event page
Nov 21, 2017
63c511f
updating event page
Nov 21, 2017
2a411c3
updating event page
Nov 21, 2017
957a921
Merge branch 'UIFeatures' into dev
Nov 21, 2017
3cda60c
updating event page
Nov 21, 2017
53ecdd8
Fixed location issues, added progressbar when location can't be found
Mattheo28 Nov 22, 2017
d91420a
Made location permissions more user friendly
Mattheo28 Nov 22, 2017
1910bad
updated the contributions
Nov 23, 2017
ea4fb34
fixed the login stuff
Nov 23, 2017
6b7ea06
Merge branch 'MakingGroups' into fixed_location
Nov 23, 2017
25ecf36
merged
Nov 24, 2017
629c81b
merged
Nov 24, 2017
28b7d3f
had to update the target sdk
Nov 24, 2017
09b02a2
Merge branch 'MakingGroups' of /Users/henryhargreaves/Documents/Unive…
Nov 26, 2017
ef340bc
Fixed pin being added when event not created
Mattheo28 Nov 29, 2017
09f71de
Added event info activity and clickable markers
Mattheo28 Nov 29, 2017
4bde73e
fixing the search
Nov 30, 2017
1d7e2f3
fixing the search
Nov 30, 2017
048480d
fixing the search
Nov 30, 2017
4ab9af8
fixing the search
Nov 30, 2017
c1dff39
adding in the view friends and fixing bugs
Dec 1, 2017
026b8ca
Merge branch 'MakingGroups' of https://github.com/hwhh/CMPS121GroupPr…
Mattheo28 Dec 2, 2017
1858c7f
Adding buttons to search results
Dec 2, 2017
93057d1
added new buttons
Dec 2, 2017
f6db7c2
adding in the view friends and fixing bugs
Dec 2, 2017
d7dd605
Updated buttons
Dec 2, 2017
5201c52
Added UI for create group
Dec 3, 2017
b08e239
adding in the view friends and fixing bugs
Dec 3, 2017
3e420c1
Event is tied to marker, clicking on marker takes you to event info
Mattheo28 Dec 3, 2017
685c17f
Merge branch 'MakingGroups' of https://github.com/hwhh/CMPS121GroupPr…
Mattheo28 Dec 3, 2017
5f9006d
adding in the view friends and fixing bugs
Dec 3, 2017
b108241
adding in the view friends and fixing bugs
Dec 3, 2017
4771378
Rearranged radio button
Dec 3, 2017
4d55ceb
Resized button
Dec 3, 2017
e5e8260
Reformat new group page
Dec 4, 2017
a35de22
Edit
Dec 4, 2017
91d6358
Edit
Dec 4, 2017
52fb372
adding in the view friends and fixing bugs
Dec 4, 2017
eeef949
Profile page set up
Dec 4, 2017
5540f29
Start of being able to join events
Mattheo28 Dec 4, 2017
f955956
edited manifest
Dec 4, 2017
cddfc7b
Merge branch 'UIFix' into MakingGroups
Dec 4, 2017
dd3e2dd
adding in the view friends and fixing bugs
Dec 4, 2017
b5cf9ac
Merge remote-tracking branch 'origin/UIFix' into MakingGroups
Dec 4, 2017
0e97ae5
Update
Dec 4, 2017
6d59268
Changed 'leaving event' function in databaseAPI
Mattheo28 Dec 4, 2017
84c2b1d
Merge branch 'MakingGroups' of https://github.com/hwhh/CMPS121GroupPr…
Dec 4, 2017
4377080
Merge branch 'MakingGroups' of https://github.com/hwhh/CMPS121GroupPr…
Dec 4, 2017
4ea0e55
adding in the view friends and fixing bugs
Dec 4, 2017
7058ec6
Merge branch 'MakingGroups' of https://github.com/hwhh/CMPS121GroupPr…
Mattheo28 Dec 4, 2017
417999e
merging henry's branch
Mattheo28 Dec 4, 2017
60eba7b
View group page
Dec 4, 2017
38f9e57
Merge branch 'MakingGroups' into UIFix
Dec 4, 2017
e5df807
Merge remote-tracking branch 'origin/joining_events' into MakingGroups
Dec 4, 2017
a5c8c4f
adding in the view friends and fixing bugs
Dec 4, 2017
693e7f7
merged
Dec 4, 2017
e35e0a7
Merge branch 'MakingGroups' into UIFix
Dec 4, 2017
8a439af
made viewgroup
Dec 4, 2017
7c4d58b
Edit profile and view group
Dec 4, 2017
a351347
Edited user profile
Dec 4, 2017
00ca5f2
merged
Dec 4, 2017
6351e4c
Merge branch 'MakingGroups' of https://github.com/hwhh/CMPS121GroupPr…
Mattheo28 Dec 4, 2017
d631a6d
merged
Dec 4, 2017
7a7b179
Changed some UI settings
Dec 4, 2017
a418faa
Merge branch 'MakingGroups' of https://github.com/hwhh/CMPS121GroupPr…
Mattheo28 Dec 5, 2017
fb95819
merged
Dec 5, 2017
6aa4006
updated database api usage
Mattheo28 Dec 5, 2017
266e57c
Merge branch 'MakingGroups' of https://github.com/hwhh/CMPS121GroupPr…
Mattheo28 Dec 5, 2017
a137090
updated database api usage further
Mattheo28 Dec 5, 2017
ada3214
merged
Dec 5, 2017
002e123
Merge remote-tracking branch 'origin/joining_events' into MakingGroups
Dec 5, 2017
a85bc46
Merge branch 'joining_events' of https://github.com/hwhh/CMPS121Group…
Dec 5, 2017
be4231c
updated activity
Mattheo28 Dec 5, 2017
72506b5
merged
Dec 5, 2017
a1845f7
Merge branch 'MakingGroups' of https://github.com/hwhh/CMPS121GroupPr…
Mattheo28 Dec 5, 2017
2da6fac
Merge remote-tracking branch 'origin/UIFix' into MakingGroups
Dec 5, 2017
390b67a
Update
Dec 5, 2017
93558ec
Merge branch 'UIFix' of https://github.com/hwhh/CMPS120GroupProject i…
Dec 5, 2017
0bf8d29
joining event works
Mattheo28 Dec 5, 2017
7ccd839
merged
Dec 5, 2017
93d5ef5
merged
Dec 5, 2017
7469380
adding num of people going to event view, changed colours
Mattheo28 Dec 5, 2017
e5eb1e3
merged
Dec 5, 2017
4aa18fe
Merge branch 'joining_events' of https://github.com/hwhh/CMPS121Group…
Dec 5, 2017
a55cba4
Added border pic
Dec 5, 2017
a52710c
Merge branch 'MakingGroups' of https://github.com/hwhh/CMPS121GroupPr…
Mattheo28 Dec 5, 2017
7a3b656
merged
Dec 5, 2017
e91dde4
added delete button for host on event
Mattheo28 Dec 5, 2017
0b9fc1d
Merge branch 'joining_events' of https://github.com/hwhh/CMPS121Group…
Dec 5, 2017
d653f88
merged
Dec 5, 2017
92e6c75
Font change
Dec 5, 2017
224d46e
fix
Dec 5, 2017
80d5529
Merge branch 'UIFix2' of https://github.com/hwhh/CMPS121GroupProject …
Mattheo28 Dec 5, 2017
3ed53e9
Added button
Dec 5, 2017
67da0b4
Merge branch 'UIFix2' of https://github.com/hwhh/CMPS121GroupProject …
Mattheo28 Dec 5, 2017
37e1271
swapped button
Dec 5, 2017
03d05cf
Merge branch 'UIFix2' of https://github.com/hwhh/CMPS121GroupProject …
Mattheo28 Dec 5, 2017
0cc6eb7
Added button
Dec 5, 2017
f625f8a
Added button
Dec 5, 2017
7f44064
Merge branch 'UIFix2' of https://github.com/hwhh/CMPS121GroupProject …
Mattheo28 Dec 5, 2017
61438f5
Merge branch 'MakingGroups' of https://github.com/hwhh/CMPS121GroupPr…
Mattheo28 Dec 5, 2017
1b241e8
updated the delete function
Dec 5, 2017
315a509
fixed error
Dec 5, 2017
daead95
Merge branch 'UIFix2' of https://github.com/hwhh/CMPS121GroupProject …
Mattheo28 Dec 5, 2017
a7fed98
updated the delete functions
Dec 5, 2017
5c62520
updated the search view on resume
Dec 5, 2017
77f404c
Merge branch 'UIFix1' of https://github.com/hwhh/CMPS121GroupProject …
Dec 5, 2017
7260d19
Merge branch 'MakingGroups' of https://github.com/hwhh/CMPS121GroupPr…
Mattheo28 Dec 5, 2017
faf0781
updated the search view on resume
Dec 5, 2017
28e3c17
Font change
Dec 5, 2017
6631963
Font change
Dec 5, 2017
dbfad8d
updated the search view on resume
Dec 5, 2017
16590c5
Merge branch 'UIFix2' of https://github.com/hwhh/CMPS121GroupProject …
Dec 5, 2017
9e966f3
User profile name should now change
Dec 5, 2017
30aca0d
Can now upload photo to server
Dec 5, 2017
529e36c
User profile name changes
Dec 5, 2017
b99b27b
Issue fixed
Dec 6, 2017
de34b13
Upload and download pic working
Dec 6, 2017
c777dbd
dding
Dec 6, 2017
f1dd504
added the inviting
Dec 6, 2017
4181702
added the inviting
Dec 6, 2017
1ff05ba
added the inviting
Dec 6, 2017
eccbd53
Merge branch 'addingInvites' of https://github.com/hwhh/CMPS121GroupP…
Mattheo28 Dec 6, 2017
58766dd
added the inviting
Dec 6, 2017
fc7a0e0
Merge branch 'addingInvites' of https://github.com/hwhh/CMPS121GroupP…
Mattheo28 Dec 6, 2017
8be3dd6
Uploadable and downloadable pics
Dec 6, 2017
dfc133d
added the inviting
Dec 6, 2017
99c7591
Merge branch 'addingInvites' into UIFix2
Dec 6, 2017
fca36ee
added the inviting
Dec 6, 2017
3c4cb7d
Changed buttons
Dec 6, 2017
621cb6b
added the inviting
Dec 6, 2017
dddd7a1
fixing join
Mattheo28 Dec 6, 2017
9b966c4
Merge branch 'addingInvites' of https://github.com/hwhh/CMPS121GroupP…
Mattheo28 Dec 6, 2017
5788073
merging
Mattheo28 Dec 6, 2017
116df56
merging
Mattheo28 Dec 6, 2017
99bbbba
added the inviting
Dec 6, 2017
1702f4a
Merge branch 'addingInvites' of https://github.com/hwhh/CMPS121GroupP…
Mattheo28 Dec 6, 2017
ac912cb
Deleted ImageStorage class
Dec 6, 2017
395e33b
added the inviting
Dec 6, 2017
7258399
fixed event joining, creating and listview
Mattheo28 Dec 6, 2017
64d62ef
Changes to buttons
Dec 6, 2017
d2e3c7b
Merge branch 'profile_edit' into UIFix2
Dec 6, 2017
12bb53a
added the inviting
Dec 6, 2017
a57593c
Merge branch 'UIFix2' of https://github.com/hwhh/CMPS121GroupProject …
Dec 6, 2017
7f42002
UI brush up
Dec 6, 2017
68f54bf
Font change
Dec 6, 2017
e9329ab
added the inviting
Dec 6, 2017
938d8c7
minor button fix
Dec 6, 2017
0d387f5
added the inviting
Dec 7, 2017
8f64691
added the inviting
Dec 7, 2017
e909c8f
Merge branch 'joining_events' of https://github.com/hwhh/CMPS121Group…
Dec 7, 2017
e9d4e34
Merge branch 'UIFix2' of https://github.com/hwhh/CMPS121GroupProject …
Dec 7, 2017
de8a9dd
added the inviting
Dec 7, 2017
cad6885
added the inviting
Dec 7, 2017
ca5bac6
Layout fix
Dec 7, 2017
72a9dc8
Layout fix
Dec 7, 2017
50231f4
Merged with addingInvites
Mattheo28 Dec 7, 2017
0f837e3
start attempt for notifications
Mattheo28 Dec 7, 2017
8f6afb6
start attempt for notifications
Mattheo28 Dec 7, 2017
4d6edbf
Fixed page
Dec 7, 2017
6171acc
Fixed page
Dec 7, 2017
8c71a3f
start attempt for notifications
Mattheo28 Dec 7, 2017
dfe6ff2
start attempt for notifications
Mattheo28 Dec 7, 2017
fc866b3
merging
Mattheo28 Dec 7, 2017
673fefd
merging
Mattheo28 Dec 7, 2017
65d3e0b
Fixed button
Dec 7, 2017
52570fd
"hello world" notification works in background
Mattheo28 Dec 7, 2017
149182d
adding advanced queires
Dec 7, 2017
4ea91a1
Merge branch 'UIFix2' of https://github.com/hwhh/CMPS121GroupProject …
Dec 7, 2017
42e0c69
Merge branch 'UIFix3' of https://github.com/hwhh/CMPS121GroupProject …
Mattheo28 Dec 7, 2017
d4e70ae
completed merging with UIFix3
Mattheo28 Dec 7, 2017
ec76d62
adding advanced queires
Dec 7, 2017
b120953
Merge branch 'merging' of https://github.com/hwhh/CMPS121GroupProject…
Dec 7, 2017
abf3688
adding personalised notifications
Mattheo28 Dec 7, 2017
8568f1f
Merge branch 'UIFix3' of https://github.com/hwhh/CMPS121GroupProject …
Mattheo28 Dec 7, 2017
2a0e96c
update
Dec 8, 2017
aa9dd43
adding advanced queires
Dec 8, 2017
8dd22ef
adding advanced queires
Dec 8, 2017
347b744
Merge branch 'UIFix4' of https://github.com/hwhh/CMPS121GroupProject …
Dec 8, 2017
d21bfbb
Update
Dec 8, 2017
347ed3f
all my shit is done.
Dec 8, 2017
7dbed8d
all my shit is done. mk2
Dec 8, 2017
e772ef0
all my shit is done. mk2
Dec 10, 2017
04f86bb
Edited event info page
Dec 10, 2017
d60e3be
all my shit is done. mk2
Dec 10, 2017
1f68584
all my shit is done. mk2
Dec 10, 2017
efcbbe6
Merge branch 'UIFix3' into UICustomise
Dec 10, 2017
d0a39f6
Fixed button
Dec 10, 2017
1877971
Changes
Dec 10, 2017
209946c
More changes
Dec 10, 2017
babe009
UI clean up
Dec 10, 2017
cf66919
adding personalised notifications
Mattheo28 Dec 10, 2017
f528851
Merge branch 'UIFix3' of https://github.com/hwhh/CMPS121GroupProject …
Mattheo28 Dec 10, 2017
f1426b3
personalised notifications work
Mattheo28 Dec 10, 2017
08ceb83
notifications take you to notifications page and get removed when cli…
Mattheo28 Dec 10, 2017
0b37aea
Merge branch 'UICustomise' of https://github.com/hwhh/CMPS121GroupPro…
Mattheo28 Dec 10, 2017
402bba7
updated UI
Mattheo28 Dec 10, 2017
b7b4bc8
code clean up
Mattheo28 Dec 11, 2017
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
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,6 @@ output.json #Since Android Studio 3.0

#NDK
obj/
.externalNativeBuild
.externalNativeBuild

/DEPRECATED
1 change: 0 additions & 1 deletion .idea/modules.xml

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

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

android {
compileSdkVersion 25
compileSdkVersion 27
buildToolsVersion "26.0.2"
defaultConfig {
applicationId "com.groupproject"
minSdkVersion 15
targetSdkVersion 25
minSdkVersion 24
targetSdkVersion 27
multiDexEnabled true
versionCode 1
versionName "1.0"

// resConfigs "auto"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
vectorDrawables.useSupportLibrary = true
}
buildTypes {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}

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

dependencies {
implementation 'com.google.firebase:firebase-auth:11.0.4'
implementation 'com.google.firebase:firebase-storage:11.6.2'
compile fileTree(dir: 'libs', include: ['*.jar'])
androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
exclude group: 'com.android.support', module: 'support-annotations'
})

compile 'com.firebaseui:firebase-ui-storage:0.6.0'
compile 'com.google.firebase:firebase-database:11.6.2'
compile 'com.google.firebase:firebase-core:11.6.2'
compile 'com.google.firebase:firebase-auth:11.6.2'

compile 'com.firebaseui:firebase-ui-database:3.1.0'

compile 'com.google.android.gms:play-services-location:11.6.2'
compile 'com.google.android.gms:play-services-auth:11.6.2'
compile 'com.google.android.gms:play-services-maps:11.6.2'

compile 'net.jodah:expiringmap:0.5.8'

compile 'com.android.support:appcompat-v7:25.3.1'
compile 'com.facebook.android:facebook-android-sdk:4.28.0'

compile 'com.android.support:recyclerview-v7:27.0.2'
compile 'com.android.support.constraint:constraint-layout:1.0.2'
compile 'com.facebook.android:facebook-android-sdk:[4,5)'
compile 'com.android.support:support-v4:25.3.1'
compile 'com.google.android.gms:play-services-maps:11.0.4'
compile 'com.google.android.gms:play-services:11.0.4'
compile 'com.android.support:design:25.3.1'
compile 'com.android.support:support-v4:27.0.2'
compile "com.android.support:design:27.0.2"
compile 'com.android.support:appcompat-v7:27.0.2'
compile "com.android.support:customtabs:27.0.2"
compile "com.android.support:cardview-v7:27.0.2"


testCompile 'junit:junit:4.12'
}




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












71 changes: 71 additions & 0 deletions app/google-services.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
{
"project_info": {
"project_number": "942324893888",
"firebase_url": "https://cmps121groupproject.firebaseio.com",
"project_id": "cmps121groupproject",
"storage_bucket": "cmps121groupproject.appspot.com"
},
"client": [
{
"client_info": {
"mobilesdk_app_id": "1:942324893888:android:7eae2e78f97fb57c",
"android_client_info": {
"package_name": "com.groupproject"
}
},
"oauth_client": [
{
"client_id": "942324893888-b48nk1potcm57l3qluondiori5ep7kli.apps.googleusercontent.com",
"client_type": 1,
"android_info": {
"package_name": "com.groupproject",
"certificate_hash": "258e567c165a7a69d3a877e5e9d32188891e7ff5"
}
},
{
"client_id": "942324893888-0i1o3vb81ocql43i7ij50o6ns5i6f37b.apps.googleusercontent.com",
"client_type": 1,
"android_info": {
"package_name": "com.groupproject",
"certificate_hash": "786cc879e8f2496637368ccd182d31376276bba8"
}
},
{
"client_id": "942324893888-eqh6lrn11gniur1e2g1oglbnqjflsuj7.apps.googleusercontent.com",
"client_type": 1,
"android_info": {
"package_name": "com.groupproject",
"certificate_hash": "ede084a57df325def457472f38c36a5b0251d13a"
}
},
{
"client_id": "942324893888-ib2l5s9342h42ro4fi94p5mbede9ad3u.apps.googleusercontent.com",
"client_type": 3
}
],
"api_key": [
{
"current_key": "AIzaSyDHwJBHBG6IXKGF3htdR01x3YS32JG-w88"
}
],
"services": {
"analytics_service": {
"status": 1
},
"appinvite_service": {
"status": 2,
"other_platform_oauth_client": [
{
"client_id": "942324893888-ib2l5s9342h42ro4fi94p5mbede9ad3u.apps.googleusercontent.com",
"client_type": 3
}
]
},
"ads_service": {
"status": 2
}
}
}
],
"configuration_version": "1"
}
5 changes: 5 additions & 0 deletions app/src/debug/res/values/strings.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="save">save</string>
<string name="end_date">end date</string>
</resources>
58 changes: 36 additions & 22 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="com.groupproject">

<uses-permission android:name="android.permission.INTERNET" />
Expand All @@ -13,22 +14,26 @@
<meta-data
android:name="com.google.android.gms.version"
android:value="@integer/google_play_services_version" />

<meta-data
android:name="com.google.android.gms.version"
android:value="@integer/google_play_services_version"
tools:replace="android:value" />
<!--
The ACCESS_COARSE/FINE_LOCATION permissions are not required to use
Google Maps Android API v2, but you must specify either coarse or fine
location permissions for the 'MyLocation' functionality.
location permissions for the 'MyLocation' functionality.
-->
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />

<application
android:allowBackup="true"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/AppTheme">
android:theme="@style/Theme.AppCompat.Light.NoActionBar">
<activity
android:name=".Controller.SplashActivity"
android:theme="@style/SplashTheme">
Expand All @@ -38,15 +43,6 @@
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity
android:name=".Controller.LoginActivity"
android:configChanges="keyboard|keyboardHidden|screenLayout|screenSize|orientation"
android:label="@string/app_name">

<meta-data
android:name="com.facebook.sdk.ApplicationId"
android:value="@string/facebook_app_id" />
</activity>
<activity
android:name="com.facebook.CustomTabActivity"
android:exported="true">
Expand All @@ -67,19 +63,37 @@
<meta-data
android:name="com.facebook.sdk.ApplicationId"
android:value="@string/facebook_app_id" />

<activity android:name=".Controller.MainActivity" />
<!--
The API key for Google Maps-based APIs is defined as a string resource.
(See the file "res/values/google_maps_api.xml").
Note that the API key is linked to the encryption key used to sign the APK.
You need a different API key for each encryption key, including the release key that is used to
sign the APK for publishing.
You can define the keys for the debug and release targets in src/debug/ and src/release/.
-->
<meta-data
android:name="com.google.android.geo.API_KEY"
android:value="@string/google_maps_key" />

<activity android:name=".Controller.LoginActivities.LoginActivity">
<meta-data
android:name="com.facebook.sdk.Pinned"
android:value="@string/facebook_app_id" />
</activity>
<activity android:name=".Controller.LoginActivities.EmailSignUpActivity" />

<meta-data
android:name="preloaded_fonts"
android:resource="@array/preloaded_fonts" />

<activity
android:name=".Controller.BaseActivity"
android:label="@string/title_activity_profile"
android:theme="@style/AppTheme.NoActionBar" />
<activity android:name=".Controller.GroupActivities.NewGroup" />
<activity android:name=".Controller.GroupActivities.ViewGroupActivity" />
<activity android:name=".Controller.EventActivities.CreateEventActivity" />
<activity android:name=".Controller.EventActivities.EventInfoActivity" />
<activity android:name=".Controller.ViewProfileActivity" />
<activity android:name=".Controller.InviteActivity"></activity>

<receiver android:name=".Controller.BootReceiver">
<intent-filter>
<action android:name="android.intent.action.BOOT_COMPLETED" />
</intent-filter> </receiver>
<service android:name=".Controller.NotificationService" />
</application>

</manifest>
Loading