Skip to content

Commit 202e400

Browse files
committed
Reorganize auth package
1 parent b6e9378 commit 202e400

17 files changed

+45
-52
lines changed

app/src/main/AndroidManifest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
</activity>
2323

2424
<!-- Twitter Configuration -->
25-
<activity android:name="com.firebase.ui.auth.TwitterPromptActivity" />
25+
<activity android:name="com.firebase.ui.auth.twitter.TwitterPromptActivity" />
2626
<meta-data
2727
android:name="com.firebase.ui.TwitterKey"
2828
android:value="@string/twitter_app_key"/>

app/src/main/java/com/firebase/uidemo/RecyclerViewDemoActivity.java

Lines changed: 6 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,5 @@
11
package com.firebase.uidemo;
22

3-
import android.graphics.Color;
4-
import android.graphics.drawable.Drawable;
5-
import android.graphics.drawable.GradientDrawable;
6-
import android.graphics.drawable.LayerDrawable;
7-
import android.graphics.drawable.ShapeDrawable;
8-
import android.graphics.drawable.shapes.Shape;
93
import android.os.Bundle;
104
import android.support.v7.widget.LinearLayoutManager;
115
import android.support.v7.widget.RecyclerView;
@@ -26,7 +20,7 @@
2620
import com.firebase.client.Firebase;
2721
import com.firebase.client.FirebaseError;
2822
import com.firebase.client.Query;
29-
import com.firebase.ui.FirebaseLoginBaseActivity;
23+
import com.firebase.ui.auth.core.FirebaseLoginBaseActivity;
3024
import com.firebase.ui.FirebaseRecyclerViewAdapter;
3125

3226
public class RecyclerViewDemoActivity extends FirebaseLoginBaseActivity {
@@ -75,13 +69,12 @@ public void onComplete(FirebaseError firebaseError, Firebase firebase) {
7569
LinearLayoutManager manager = new LinearLayoutManager(this);
7670
manager.setStackFromEnd(true);
7771

78-
mMessages.setHasFixedSize(true);
72+
mMessages.setHasFixedSize(false);
7973
mMessages.setLayoutManager(manager);
8074

8175
mRecycleViewAdapter = new FirebaseRecyclerViewAdapter<Chat, ChatHolder>(Chat.class, R.layout.message, ChatHolder.class, mChatRef) {
8276
@Override
8377
public void populateViewHolder(ChatHolder chatView, Chat chat) {
84-
8578
chatView.setName(chat.getName());
8679
chatView.setText(chat.getText());
8780

@@ -94,12 +87,6 @@ public void populateViewHolder(ChatHolder chatView, Chat chat) {
9487
};
9588

9689
mMessages.setAdapter(mRecycleViewAdapter);
97-
98-
updateChat();
99-
}
100-
101-
protected void updateChat() {
102-
mRecycleViewAdapter.notifyDataSetChanged();
10390
}
10491

10592
@Override
@@ -146,8 +133,8 @@ public void onFirebaseLoginSuccess(AuthData authData) {
146133
break;
147134
}
148135

149-
updateChat();
150136
invalidateOptionsMenu();
137+
mRecycleViewAdapter.notifyDataSetChanged();
151138
}
152139

153140
@Override
@@ -156,7 +143,7 @@ public void onFirebaseLogout() {
156143
mAuthData = null;
157144
name = "";
158145
invalidateOptionsMenu();
159-
updateChat();
146+
mRecycleViewAdapter.notifyDataSetChanged();
160147
}
161148

162149
@Override
@@ -202,7 +189,7 @@ public String getText() {
202189
}
203190

204191
public static class ChatHolder extends RecyclerView.ViewHolder {
205-
View mView;
192+
public View mView;
206193

207194
public ChatHolder(View itemView) {
208195
super(itemView);
@@ -213,6 +200,7 @@ public void setIsSender(Boolean isSender) {
213200
FrameLayout left_arrow = (FrameLayout) mView.findViewById(R.id.left_arrow);
214201
FrameLayout right_arrow = (FrameLayout) mView.findViewById(R.id.right_arrow);
215202
RelativeLayout messageContainer = (RelativeLayout) mView.findViewById(R.id.message_container);
203+
LinearLayout message = (LinearLayout) mView.findViewById(R.id.message);
216204

217205

218206
if (isSender) {
@@ -223,7 +211,6 @@ public void setIsSender(Boolean isSender) {
223211
left_arrow.setVisibility(View.VISIBLE);
224212
right_arrow.setVisibility(View.GONE);
225213
messageContainer.setGravity(Gravity.LEFT);
226-
227214
}
228215
}
229216

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
tools:context=".RecyclerViewDemoActivity">
88

99
<android.support.v7.widget.RecyclerView
10-
android:layout_width="wrap_content"
10+
android:layout_width="match_parent"
1111
android:layout_height="wrap_content"
1212
android:id="@+id/messagesList"
1313
android:layout_alignParentLeft="true"

library/src/main/java/com/firebase/ui/auth/FirebaseAuthHelper.java renamed to library/src/main/java/com/firebase/ui/auth/core/FirebaseAuthHelper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.firebase.ui.auth;
1+
package com.firebase.ui.auth.core;
22

33
import android.util.Log;
44

library/src/main/java/com/firebase/ui/FirebaseLoginBaseActivity.java renamed to library/src/main/java/com/firebase/ui/auth/core/FirebaseLoginBaseActivity.java

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.firebase.ui;
1+
package com.firebase.ui.auth.core;
22

33
import android.content.Intent;
44
import android.support.v7.app.AppCompatActivity;
@@ -7,12 +7,10 @@
77
import com.firebase.client.AuthData;
88
import com.firebase.client.Firebase;
99
import com.firebase.client.FirebaseError;
10-
import com.firebase.ui.auth.FacebookAuthHelper;
11-
import com.firebase.ui.auth.GoogleAuthHelper;
12-
import com.firebase.ui.auth.PasswordAuthHelper;
13-
import com.firebase.ui.auth.SocialProvider;
14-
import com.firebase.ui.auth.TokenAuthHandler;
15-
import com.firebase.ui.auth.TwitterAuthHelper;
10+
import com.firebase.ui.auth.facebook.FacebookAuthHelper;
11+
import com.firebase.ui.auth.google.GoogleAuthHelper;
12+
import com.firebase.ui.auth.password.PasswordAuthHelper;
13+
import com.firebase.ui.auth.twitter.TwitterAuthHelper;
1614

1715
public abstract class FirebaseLoginBaseActivity extends AppCompatActivity {
1816

library/src/main/java/com/firebase/ui/FirebaseLoginDialog.java renamed to library/src/main/java/com/firebase/ui/auth/core/FirebaseLoginDialog.java

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,23 @@
1-
package com.firebase.ui;
1+
package com.firebase.ui.auth.core;
22

33
import android.app.AlertDialog;
44
import android.app.Dialog;
55
import android.app.DialogFragment;
66
import android.content.Context;
77
import android.content.Intent;
88
import android.os.Bundle;
9-
import android.util.Log;
109
import android.view.LayoutInflater;
1110
import android.view.View;
1211
import android.widget.EditText;
1312

1413
import com.firebase.client.AuthData;
1514
import com.firebase.client.Firebase;
1615
import com.firebase.client.FirebaseError;
17-
import com.firebase.ui.auth.FacebookAuthHelper;
18-
import com.firebase.ui.auth.FirebaseAuthHelper;
19-
import com.firebase.ui.auth.GoogleAuthHelper;
20-
import com.firebase.ui.auth.PasswordAuthHelper;
21-
import com.firebase.ui.auth.SocialProvider;
22-
import com.firebase.ui.auth.TokenAuthHandler;
23-
import com.firebase.ui.auth.TwitterAuthHelper;
16+
import com.firebase.ui.R;
17+
import com.firebase.ui.auth.facebook.FacebookAuthHelper;
18+
import com.firebase.ui.auth.google.GoogleAuthHelper;
19+
import com.firebase.ui.auth.password.PasswordAuthHelper;
20+
import com.firebase.ui.auth.twitter.TwitterAuthHelper;
2421

2522
public class FirebaseLoginDialog extends DialogFragment {
2623

library/src/main/java/com/firebase/ui/auth/FirebaseOAuthToken.java renamed to library/src/main/java/com/firebase/ui/auth/core/FirebaseOAuthToken.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.firebase.ui.auth;
1+
package com.firebase.ui.auth.core;
22

33
public class FirebaseOAuthToken {
44
public String token;

library/src/main/java/com/firebase/ui/auth/FirebaseStatuses.java renamed to library/src/main/java/com/firebase/ui/auth/core/FirebaseStatuses.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.firebase.ui.auth;
1+
package com.firebase.ui.auth.core;
22

33
/**
44
* Created by abehaskins on 11/9/15.

library/src/main/java/com/firebase/ui/auth/SocialProvider.java renamed to library/src/main/java/com/firebase/ui/auth/core/SocialProvider.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.firebase.ui.auth;
1+
package com.firebase.ui.auth.core;
22

33
// Note: these enum values must be lowercase, to ensure they match the casing used by the Firebase Authentication providers
44
public enum SocialProvider {

library/src/main/java/com/firebase/ui/auth/TokenAuthHandler.java renamed to library/src/main/java/com/firebase/ui/auth/core/TokenAuthHandler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.firebase.ui.auth;
1+
package com.firebase.ui.auth.core;
22

33
import com.firebase.client.AuthData;
44
import com.firebase.client.FirebaseError;

0 commit comments

Comments
 (0)