Auth code cleanup

.travis.yml

@@ -2,7 +2,6 @@ language: android
 jdk: oraclejdk8
 # See https://github.com/travis-ci/travis-ci/issues/5582
 sudo: required
-# See https://docs.travis-ci.com/user/languages/java/#Caching
 before_cache:
   - rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock
   - rm -fr $HOME/.gradle/caches/*/plugin-resolution/
@@ -18,8 +17,6 @@ android:
     - android-25
 
     # Extras
-    - extra-google-google_play_services
     - extra-google-m2repository
     - extra-android-m2repository
-    - addon-google_apis-google-24
 script: ./gradlew clean :library:testAll :library:prepareArtifacts

app/build.gradle

@@ -3,13 +3,13 @@ apply plugin: 'com.neenbedankt.android-apt'
 apply from: "../common/constants.gradle"
 
 android {
-    compileSdkVersion project.ext.compileSdk
-    buildToolsVersion "${project.ext.buildtools}"
+    compileSdkVersion compileSdk
+    buildToolsVersion buildTools
 
     defaultConfig {
         applicationId "com.firebase.uidemo"
         minSdkVersion 16
-        targetSdkVersion project.ext.targetSdk
+        targetSdkVersion targetSdk
         versionCode 1
         versionName "1.0"
     }
@@ -24,32 +24,28 @@ android {
             signingConfig signingConfigs.debug
         }
     }
-
 }
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile "com.android.support:appcompat-v7:${project.ext.support_library_version}"
-    compile "com.android.support:design:${project.ext.support_library_version}"
-    compile "com.android.support:recyclerview-v7:${project.ext.support_library_version}"
-    compile "com.android.support:support-v4:${project.ext.support_library_version}"
+    compile "com.android.support:design:$support_library_version"
 
     compile project(path: ':auth')
     compile project(path: ':database')
     compile project(path: ':storage')
 
-    compile "com.google.firebase:firebase-database:${project.ext.firebase_version}"
-    compile "com.google.firebase:firebase-auth:${project.ext.firebase_version}"
-    compile "com.google.firebase:firebase-storage:${project.ext.firebase_version}"
-    compile "com.google.android.gms:play-services-auth:${project.ext.firebase_version}"
+    compile "com.google.android.gms:play-services-auth:$firebase_version"
+    compile "com.google.firebase:firebase-auth:$firebase_version"
+    compile "com.google.firebase:firebase-database:$firebase_version"
+    compile "com.google.firebase:firebase-storage:$firebase_version"
 
     // The following dependencies are not required to use the Firebase UI library.
     // They are used to make some aspects of the demo app implementation simpler for
     // demonstrative purposes, and you may find them useful in your own apps; YMMV.
-    compile 'com.jakewharton:butterknife:8.0.1'
     compile 'com.github.bumptech.glide:glide:3.7.0'
-    compile 'pub.devrel:easypermissions:0.2.0'
-    apt 'com.jakewharton:butterknife-compiler:8.0.1'
+    compile 'pub.devrel:easypermissions:0.2.1'
+    compile 'com.jakewharton:butterknife:8.4.0'
+    apt 'com.jakewharton:butterknife-compiler:8.4.0'
 }
 
 apply plugin: 'com.google.gms.google-services'

app/src/main/AndroidManifest.xml

@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+<manifest
+    xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.firebase.uidemo">
 
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
 
     <application
         android:allowBackup="true"
@@ -12,30 +13,31 @@
         android:theme="@style/AppTheme">
         <activity android:name=".ChooserActivity">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
-            <meta-data android:name="android.app.shortcuts"
-                       android:resource="@xml/shortcuts" />
+            <meta-data
+                android:name="android.app.shortcuts"
+                android:resource="@xml/shortcuts"/>
         </activity>
 
         <!-- Chat demo -->
         <activity
             android:name=".database.ChatActivity"
-            android:label="@string/name_chat" />
+            android:label="@string/name_chat"/>
 
         <!-- Auth UI demo -->
         <activity
             android:name=".auth.AuthUiActivity"
-            android:label="@string/name_auth_ui" />
+            android:label="@string/name_auth_ui"/>
         <activity
             android:name=".auth.SignedInActivity"
-            android:label="@string/name_auth_ui" />
+            android:label="@string/name_auth_ui"/>
 
         <!-- Storage UI demo-->
         <activity
             android:name=".storage.ImageActivity"
-            android:label="@string/name_image" />
+            android:label="@string/name_image"/>
     </application>
 
 </manifest>

app/src/main/res/drawable/chat_message_arrow.xml

@@ -4,11 +4,12 @@
     android:fromDegrees="45"
     android:toDegrees="45"
     android:pivotX="-40%"
-    android:pivotY="87%" >
+    android:pivotY="87%">
     <shape
-        android:shape="rectangle"  >
-        <stroke android:color="@android:color/transparent" android:width="10dp"/>
-        <solid
-            android:color="@color/material_grey_300"  />
+        android:shape="rectangle">
+        <stroke
+            android:color="@android:color/transparent"
+            android:width="10dp"/>
+        <solid android:color="@color/material_grey_300"/>
     </shape>
 </rotate>

app/src/main/res/drawable/chat_message_background.xml

@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
     <corners android:radius="4dp"/>
-    <solid android:color="@color/material_grey_300" />
+    <solid android:color="@color/material_grey_300"/>
 </shape>

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

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-
     tools:context=".database.ChatActivity">
 
     <android.support.v7.widget.RecyclerView
@@ -16,7 +16,7 @@
         android:layout_alignParentTop="true"
         android:clipToPadding="false"
         android:padding="16dp"
-        tools:listitem="@layout/message" />
+        tools:listitem="@layout/message"/>
 
     <LinearLayout
         android:id="@+id/footer"
@@ -26,21 +26,24 @@
         android:layout_alignParentLeft="true"
         android:layout_alignParentStart="true"
         android:orientation="horizontal"
+        android:paddingStart="16dp"
+        android:paddingEnd="16dp"
         android:paddingLeft="16dp">
 
         <EditText
             android:id="@+id/messageEdit"
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_weight="1" />
+            android:layout_weight="1"/>
 
         <Button
             android:id="@+id/sendButton"
             style="@style/Widget.AppCompat.Button.Borderless.Colored"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="bottom|right"
-            android:text="Send" />
+            android:layout_gravity="bottom|end"
+            android:text="Send"/>
+
     </LinearLayout>
 
 </RelativeLayout>

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

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -15,20 +15,20 @@
         style="@style/TextAppearance.AppCompat.Medium"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="Upload" />
+        android:text="Upload"/>
 
     <Button
         android:id="@+id/button_choose_photo"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="Choose Image" />
+        android:text="Choose Image"/>
 
     <TextView
         style="@style/TextAppearance.AppCompat.Medium"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="20dp"
-        android:text="Download" />
+        android:text="Download"/>
 
     <LinearLayout
         android:layout_width="wrap_content"
@@ -40,7 +40,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:enabled="false"
-            android:text="Download" />
+            android:text="Download"/>
 
     </LinearLayout>
 
@@ -51,6 +51,6 @@
         android:scaleType="centerCrop"
         android:src="#E6E6E6"
         android:visibility="invisible"
-        tools:visibility="visible" />
+        tools:visibility="visible"/>
 
 </LinearLayout>