Skip to content

Commit 93b8b16

Browse files
committed
-Added dependencies for Google Auth
-Added Google sign in button--missing logic -Updated gitignore to exclude config files for Google auth
1 parent 4a55860 commit 93b8b16

File tree

4 files changed

+18
-7
lines changed

4 files changed

+18
-7
lines changed

.gitignore

+2-1
Original file line numberDiff line numberDiff line change
@@ -56,4 +56,5 @@ cd
5656

5757
# Keystore files
5858
*.jks
59-
.signing/
59+
.signing/
60+
app/google-services.json

app/build.gradle

+8-4
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ apply plugin: 'realm-android'
33
apply plugin: 'me.tatarka.retrolambda'
44

55
android {
6-
compileSdkVersion 24
6+
compileSdkVersion 25
77
buildToolsVersion "25.0"
88
defaultConfig {
99
applicationId "io.havoc.todo"
1010
minSdkVersion 21
11-
targetSdkVersion 24
11+
targetSdkVersion 25
1212
versionCode 1
1313
versionName "1.0"
1414
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -33,8 +33,9 @@ dependencies {
3333
})
3434

3535
//Android Support Libraries
36-
compile 'com.android.support:appcompat-v7:24.2.1'
37-
compile 'com.android.support:design:24.2.1'
36+
compile 'com.android.support:appcompat-v7:25.0.1'
37+
compile 'com.android.support:design:25.0.1'
38+
compile 'com.google.android.gms:play-services-auth:10.0.0'
3839
// compile 'com.android.support.constraint:constraint-layout:1.0.0-alpha9'
3940

4041
//Advanced RecyclerView
@@ -77,3 +78,6 @@ dependencies {
7778
//Testing
7879
testCompile 'junit:junit:4.12'
7980
}
81+
82+
//Lord only knows why this has to be added at the bottom
83+
apply plugin: 'com.google.gms.google-services'

app/src/main/res/layout/activity_login.xml

+7
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,11 @@
1010
android:paddingTop="@dimen/activity_vertical_margin"
1111
tools:context="io.havoc.todo.view.activities.LoginActivity">
1212

13+
<com.google.android.gms.common.SignInButton
14+
android:id="@+id/sign_in_button"
15+
android:layout_width="wrap_content"
16+
android:layout_height="wrap_content"
17+
android:layout_centerHorizontal="true"
18+
android:layout_centerVertical="true" />
19+
1320
</RelativeLayout>

build.gradle

+1-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@ buildscript {
99
classpath 'com.android.tools.build:gradle:2.2.2'
1010
classpath "io.realm:realm-gradle-plugin:2.0.2"
1111
classpath 'me.tatarka:gradle-retrolambda:3.3.0'
12-
// NOTE: Do not place your application dependencies here; they belong
13-
// in the individual module build.gradle files
12+
classpath 'com.google.gms:google-services:3.0.0'
1413
}
1514
}
1615

0 commit comments

Comments
 (0)