Skip to content
This repository has been archived by the owner on Aug 25, 2018. It is now read-only.

Updated Gradle plugin version, Gradle version and Firebase libraries. #31

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 8 additions & 5 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ android {
exclude 'META-INF/NOTICE'
}

compileSdkVersion 21
buildToolsVersion "21.1.1"
compileSdkVersion 24
buildToolsVersion "24.0.1"

defaultConfig {
applicationId "com.firebase.androidchat"
minSdkVersion 10
targetSdkVersion 21
minSdkVersion 17
targetSdkVersion 24
versionCode 1
versionName "1.0"
}
Expand All @@ -27,5 +27,8 @@ android {

dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
compile 'com.firebase:firebase-client-android:2.0.3+'
compile 'com.google.firebase:firebase-database:9.4.0'
}


apply plugin: 'com.google.gms.google-services'
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.firebase.androidchat;

import com.firebase.client.Firebase;
import com.google.firebase.FirebaseApp;

/**
* @author Jenny Tong (mimming)
Expand All @@ -12,6 +12,6 @@ public class ChatApplication extends android.app.Application {
@Override
public void onCreate() {
super.onCreate();
Firebase.setAndroidContext(this);
//FirebaseApp.setAndroidContext(this);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import android.view.View;
import android.widget.TextView;

import com.firebase.client.Query;
import com.google.firebase.database.Query;

/**
* @author greg
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
import android.view.ViewGroup;
import android.widget.BaseAdapter;

import com.firebase.client.ChildEventListener;
import com.firebase.client.DataSnapshot;
import com.firebase.client.FirebaseError;
import com.firebase.client.Query;
import com.google.firebase.database.ChildEventListener;
import com.google.firebase.database.DataSnapshot;
import com.google.firebase.database.DatabaseError;
import com.google.firebase.database.Query;

import java.util.ArrayList;
import java.util.HashMap;
Expand Down Expand Up @@ -134,7 +134,7 @@ public void onChildMoved(DataSnapshot dataSnapshot, String previousChildName) {
}

@Override
public void onCancelled(FirebaseError firebaseError) {
public void onCancelled(DatabaseError firebaseError) {
Log.e("FirebaseListAdapter", "Listen was cancelled, no more updates will occur");
}

Expand Down
22 changes: 13 additions & 9 deletions app/src/main/java/com/firebase/androidchat/MainActivity.java
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,11 @@
import android.widget.TextView;
import android.widget.Toast;

import com.firebase.client.DataSnapshot;
import com.firebase.client.Firebase;
import com.firebase.client.FirebaseError;
import com.firebase.client.ValueEventListener;
import com.google.firebase.database.DataSnapshot;
import com.google.firebase.database.FirebaseDatabase;
import com.google.firebase.database.DatabaseReference;
import com.google.firebase.database.DatabaseError;
import com.google.firebase.database.ValueEventListener;

import java.util.Random;

Expand All @@ -24,8 +25,10 @@ public class MainActivity extends ListActivity {
// TODO: change this to your own Firebase URL
private static final String FIREBASE_URL = "https://android-chat.firebaseio-demo.com";


private String mUsername;
private Firebase mFirebaseRef;
private FirebaseDatabase mDatabase;
private DatabaseReference mFirebaseRef;
private ValueEventListener mConnectedListener;
private ChatListAdapter mChatListAdapter;

Expand All @@ -39,8 +42,9 @@ protected void onCreate(Bundle savedInstanceState) {

setTitle("Chatting as " + mUsername);

// Setup our Firebase mFirebaseRef
mFirebaseRef = new Firebase(FIREBASE_URL).child("chat");
mDatabase = FirebaseDatabase.getInstance();
mFirebaseRef = mDatabase.getReference("message");


// Setup our input methods. Enter key on the keyboard or pushing the send button
EditText inputText = (EditText) findViewById(R.id.messageInput);
Expand Down Expand Up @@ -69,7 +73,7 @@ public void onStart() {
// Setup our view and list adapter. Ensure it scrolls to the bottom as data changes
final ListView listView = getListView();
// Tell our list adapter that we only want 50 messages at a time
mChatListAdapter = new ChatListAdapter(mFirebaseRef.limit(50), this, R.layout.chat_message, mUsername);
mChatListAdapter = new ChatListAdapter(mFirebaseRef.limitToLast(50), this, R.layout.chat_message, mUsername);
listView.setAdapter(mChatListAdapter);
mChatListAdapter.registerDataSetObserver(new DataSetObserver() {
@Override
Expand All @@ -92,7 +96,7 @@ public void onDataChange(DataSnapshot dataSnapshot) {
}

@Override
public void onCancelled(FirebaseError firebaseError) {
public void onCancelled(DatabaseError dbError) {
// No-op
}
});
Expand Down
3 changes: 2 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:1.0.0'
classpath 'com.android.tools.build:gradle:2.2.0-beta1'
classpath 'com.google.gms:google-services:3.0.0'
}
}

Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Fri Dec 05 16:24:11 PST 2014
#Mon Aug 15 11:16:16 PDT 2016
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip