Skip to content

Commit a5dbbc8

Browse files
committedAug 27, 2017
Logout fixed
1 parent e90aea1 commit a5dbbc8

40 files changed

+735
-220
lines changed
 

‎.idea/modules.xml

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/vcs.xml

+6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎app/build.gradle

+14-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ android {
44
compileSdkVersion 25
55
buildToolsVersion "25.0.2"
66
defaultConfig {
7-
applicationId "io.github.iamutkarshtiwari.myapplication"
7+
applicationId "io.github.iamutkarshtiwari.trivia"
88
minSdkVersion 15
99
targetSdkVersion 25
1010
versionCode 1
@@ -17,15 +17,27 @@ android {
1717
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
1818
}
1919
}
20+
packagingOptions {
21+
exclude 'META-INF/LICENSE'
22+
exclude 'META-INF/LICENSE-FIREBASE.txt'
23+
exclude 'META-INF/NOTICE'
24+
}
2025
}
2126

2227
dependencies {
23-
compile fileTree(dir: 'libs', include: ['*.jar'])
28+
compile fileTree(include: ['*.jar'], dir: 'libs')
2429
androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
2530
exclude group: 'com.android.support', module: 'support-annotations'
2631
})
2732
compile 'com.android.support:appcompat-v7:25.3.1'
2833
compile 'com.android.support:design:25.3.1'
2934
compile 'com.jakewharton:butterknife:6.1.0'
35+
compile 'com.google.firebase:firebase-core:11.2.0'
36+
compile 'com.google.firebase:firebase-database:11.2.0'
37+
compile 'com.google.firebase:firebase-storage:11.2.0'
38+
compile 'com.google.firebase:firebase-auth:11.2.0'
39+
compile 'com.google.android.gms:play-services-auth:11.2.0'
3040
testCompile 'junit:junit:4.12'
3141
}
42+
43+
apply plugin: 'com.google.gms.google-services'

‎app/google-services.json

+55
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
{
2+
"project_info": {
3+
"project_number": "383797104405",
4+
"firebase_url": "https://trivia-quiz7.firebaseio.com",
5+
"project_id": "trivia-quiz7",
6+
"storage_bucket": "trivia-quiz7.appspot.com"
7+
},
8+
"client": [
9+
{
10+
"client_info": {
11+
"mobilesdk_app_id": "1:383797104405:android:d09ed27962453fba",
12+
"android_client_info": {
13+
"package_name": "io.github.iamutkarshtiwari.trivia"
14+
}
15+
},
16+
"oauth_client": [
17+
{
18+
"client_id": "383797104405-bn9te7oupgo6itrfi0el5abta1ofkuqk.apps.googleusercontent.com",
19+
"client_type": 1,
20+
"android_info": {
21+
"package_name": "io.github.iamutkarshtiwari.trivia",
22+
"certificate_hash": "551d32370dcb99e4f5a4ef4091e94581a6716918"
23+
}
24+
},
25+
{
26+
"client_id": "383797104405-u070umo1os0006r815s131c563abtthp.apps.googleusercontent.com",
27+
"client_type": 3
28+
}
29+
],
30+
"api_key": [
31+
{
32+
"current_key": "AIzaSyBMILsnTCxErYsMmC4CP-82MYUlyx3htV0"
33+
}
34+
],
35+
"services": {
36+
"analytics_service": {
37+
"status": 1
38+
},
39+
"appinvite_service": {
40+
"status": 2,
41+
"other_platform_oauth_client": [
42+
{
43+
"client_id": "383797104405-u070umo1os0006r815s131c563abtthp.apps.googleusercontent.com",
44+
"client_type": 3
45+
}
46+
]
47+
},
48+
"ads_service": {
49+
"status": 2
50+
}
51+
}
52+
}
53+
],
54+
"configuration_version": "1"
55+
}

‎app/src/androidTest/java/io/github/iamutkarshtiwari/myapplication/ExampleInstrumentedTest.java ‎app/src/androidTest/java/io/github/iamutkarshtiwari/trivia/ExampleInstrumentedTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.github.iamutkarshtiwari.myapplication;
1+
package io.github.iamutkarshtiwari.trivia;
22

33
import android.content.Context;
44
import android.support.test.InstrumentationRegistry;

‎app/src/main/AndroidManifest.xml

+8-5
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,22 @@
1818
android:name=".LoginActivity"
1919
android:label="@string/title_activity_login"
2020
android:theme="@style/NoActionBar">
21+
</activity>
22+
<activity
23+
android:name=".Trivia"
24+
android:label="@string/app_name"
25+
android:theme="@style/NoActionBar">
2126
<intent-filter>
2227
<action android:name="android.intent.action.MAIN" />
2328

2429
<category android:name="android.intent.category.LAUNCHER" />
2530
</intent-filter>
31+
2632
</activity>
27-
<activity
28-
android:name=".Trivia"
29-
android:label="@string/app_name"
33+
34+
<activity android:name=".SignupActivity"
3035
android:theme="@style/NoActionBar"/>
31-
<activity android:name=".SignupActivity">
3236

33-
</activity>
3437
</application>
3538

3639
</manifest>

‎app/src/main/assets/font/JustTell.otf

-4.48 KB
Binary file not shown.

‎app/src/main/ic_launcher-web.png

21.3 KB
Loading

‎app/src/main/java/io/github/iamutkarshtiwari/myapplication/LoginActivity.java

-143
This file was deleted.

0 commit comments

Comments
 (0)
Please sign in to comment.