restructure java files to match similar format as FireBase

Author: Salakar

android/src/main/java/io/fullstack/firestack/Database.java

@@ -1,16 +1,15 @@
 package io.fullstack.firestack;
 
-/**
- * Created by nori on 2016/09/12.
- */
-import android.content.Intent;
-import android.os.Bundle;
 import android.util.Log;
+import android.os.Bundle;
+import android.content.Intent;
 
 import com.google.firebase.iid.FirebaseInstanceId;
 import com.google.firebase.iid.FirebaseInstanceIdService;
 
-public class InstanceIdService extends FirebaseInstanceIdService {
+import io.fullstack.firestack.messaging.FirestackMessaging;
+
+public class FirestackInstanceIdService extends FirebaseInstanceIdService {
 
     private static final String TAG = "FSInstanceIdService";
 
@@ -21,7 +20,7 @@ public class InstanceIdService extends FirebaseInstanceIdService {
     public void onTokenRefresh() {
         String refreshedToken = FirebaseInstanceId.getInstance().getToken();
         Log.d(TAG, "Refreshed token: " + refreshedToken);
-        Intent i = new Intent(Messaging.INTENT_NAME_TOKEN);
+        Intent i = new Intent(FirestackMessaging.INTENT_NAME_TOKEN);
         Bundle bundle = new Bundle();
         bundle.putString("token", refreshedToken);
         i.putExtras(bundle);

…llstack/firestack/InstanceIdService.java …irestack/FirestackInstanceIdService.javaandroid/src/main/java/io/fullstack/firestack/InstanceIdService.java renamed to android/src/main/java/io/fullstack/firestack/FirestackInstanceIdService.java android/src/main/java/io/fullstack/firestack/InstanceIdService.java renamed to android/src/main/java/io/fullstack/firestack/FirestackInstanceIdService.java

@@ -7,7 +7,9 @@
 import com.google.firebase.messaging.RemoteMessage;
 import com.google.firebase.messaging.SendException;
 
-public class MessagingService extends FirebaseMessagingService {
+import io.fullstack.firestack.messaging.FirestackMessaging;
+
+public class FirestackMessagingService extends FirebaseMessagingService {
 
     private static final String TAG = "FSMessagingService";
 
@@ -25,7 +27,7 @@ public void onMessageReceived(RemoteMessage remoteMessage) {
         if (remoteMessage.getNotification() != null) {
 
         }
-        Intent i = new Intent(Messaging.INTENT_NAME_NOTIFICATION);
+        Intent i = new Intent(FirestackMessaging.INTENT_NAME_NOTIFICATION);
         i.putExtra("data", remoteMessage);
         sendOrderedBroadcast(i, null);
 
@@ -35,7 +37,7 @@ public void onMessageReceived(RemoteMessage remoteMessage) {
     public void onMessageSent(String msgId) {
         // Called when an upstream message has been successfully sent to the GCM connection server.
         Log.d(TAG, "upstream message has been successfully sent");
-        Intent i = new Intent(Messaging.INTENT_NAME_SEND);
+        Intent i = new Intent(FirestackMessaging.INTENT_NAME_SEND);
         i.putExtra("msgId", msgId);
         sendOrderedBroadcast(i, null);
     }
@@ -44,7 +46,7 @@ public void onMessageSent(String msgId) {
     public void onSendError(String msgId, Exception exception) {
         // Called when there was an error sending an upstream message.
         Log.d(TAG, "error sending an upstream message");
-        Intent i = new Intent(Messaging.INTENT_NAME_SEND);
+        Intent i = new Intent(FirestackMessaging.INTENT_NAME_SEND);
         i.putExtra("msgId", msgId);
         i.putExtra("hasError", true);
         SendException sendException = (SendException) exception;

…ullstack/firestack/MessagingService.java …firestack/FirestackMessagingService.javaandroid/src/main/java/io/fullstack/firestack/MessagingService.java renamed to android/src/main/java/io/fullstack/firestack/FirestackMessagingService.java android/src/main/java/io/fullstack/firestack/MessagingService.java renamed to android/src/main/java/io/fullstack/firestack/FirestackMessagingService.java

@@ -27,13 +27,13 @@ interface KeySetterFn {
 }
 
 @SuppressWarnings("WeakerAccess")
-class Module extends ReactContextBaseJavaModule implements LifecycleEventListener {
+class FirestackModule extends ReactContextBaseJavaModule implements LifecycleEventListener {
   private static final String TAG = "Firestack";
   private Context context;
   private ReactContext mReactContext;
   private FirebaseApp app;
 
-  public Module(ReactApplicationContext reactContext, Context context) {
+  public FirestackModule(ReactApplicationContext reactContext, Context context) {
     super(reactContext);
     this.context = context;
     mReactContext = reactContext;

…/java/io/fullstack/firestack/Module.java …fullstack/firestack/FirestackModule.javaandroid/src/main/java/io/fullstack/firestack/Module.java renamed to android/src/main/java/io/fullstack/firestack/FirestackModule.java android/src/main/java/io/fullstack/firestack/Module.java renamed to android/src/main/java/io/fullstack/firestack/FirestackModule.java

@@ -6,12 +6,19 @@
 import com.facebook.react.bridge.JavaScriptModule;
 import com.facebook.react.bridge.NativeModule;
 import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.uimanager.UIManagerModule;
 import com.facebook.react.uimanager.ViewManager;
 
 import java.util.List;
 import java.util.ArrayList;
 import java.util.Collections;
 
+import io.fullstack.firestack.auth.FirestackAuth;
+import io.fullstack.firestack.storage.FirestackStorage;
+import io.fullstack.firestack.database.FirestackDatabase;
+import io.fullstack.firestack.analytics.FirestackAnalytics;
+import io.fullstack.firestack.messaging.FirestackMessaging;
+
 @SuppressWarnings("unused")
 public class FirestackPackage implements ReactPackage {
     private Context mContext;
@@ -25,12 +32,12 @@ public FirestackPackage() {
     @Override
     public List<NativeModule> createNativeModules(ReactApplicationContext reactContext) {
         List<NativeModule> modules = new ArrayList<>();
-        modules.add(new Module(reactContext, reactContext.getBaseContext()));
-        modules.add(new Auth(reactContext));
-        modules.add(new Database(reactContext));
-        modules.add(new Analytics(reactContext));
-        modules.add(new Storage(reactContext));
-        modules.add(new Messaging(reactContext));
+        modules.add(new FirestackModule(reactContext, reactContext.getBaseContext()));
+        modules.add(new FirestackAuth(reactContext));
+        modules.add(new FirestackDatabase(reactContext));
+        modules.add(new FirestackAnalytics(reactContext));
+        modules.add(new FirestackStorage(reactContext));
+        modules.add(new FirestackMessaging(reactContext));
         return modules;
     }
 

android/src/main/java/io/fullstack/firestack/FirestackPackage.java

@@ -37,9 +37,7 @@ public static void todoNote(final String tag, final String name, final Callback
   /**
    * send a JS event
    **/
-  public static void sendEvent(final ReactContext context,
-                               final String eventName,
-                               final WritableMap params) {
+  public static void sendEvent(final ReactContext context, final String eventName, final WritableMap params) {
     if (context.hasActiveCatalystInstance()) {
       context
           .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)

android/src/main/java/io/fullstack/firestack/Utils.java

@@ -1,4 +1,4 @@
-package io.fullstack.firestack;
+package io.fullstack.firestack.analytics;
 
 import java.util.Map;
 import android.util.Log;
@@ -11,14 +11,16 @@
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
 
-class Analytics extends ReactContextBaseJavaModule {
+import io.fullstack.firestack.Utils;
+
+public class FirestackAnalytics extends ReactContextBaseJavaModule {
 
   private static final String TAG = "FirestackAnalytics";
 
   private ReactApplicationContext context;
   private FirebaseAnalytics mFirebaseAnalytics;
 
-  public Analytics(ReactApplicationContext reactContext) {
+  public FirestackAnalytics(ReactApplicationContext reactContext) {
     super(reactContext);
     context = reactContext;
     Log.d(TAG, "New instance");
@@ -111,7 +113,7 @@ public void setUserProperty(final String name, final String value) {
   // todo refactor/clean me
   private Bundle makeEventBundle(final String name, final Map<String, Object> map) {
     Bundle bundle = new Bundle();
-    // Available from the Analytics event
+    // Available from the FirestackAnalytics event
     if (map.containsKey("id")) {
       String id = (String) map.get("id");
       bundle.putString(FirebaseAnalytics.Param.ITEM_ID, id);

…va/io/fullstack/firestack/Analytics.java …estack/analytics/FirestackAnalytics.javaandroid/src/main/java/io/fullstack/firestack/Analytics.java renamed to android/src/main/java/io/fullstack/firestack/analytics/FirestackAnalytics.java android/src/main/java/io/fullstack/firestack/Analytics.java renamed to android/src/main/java/io/fullstack/firestack/analytics/FirestackAnalytics.java

@@ -1,5 +1,5 @@
 
-package io.fullstack.firestack;
+package io.fullstack.firestack.auth;
 
 import android.util.Log;
 
@@ -29,9 +29,11 @@
 import com.google.firebase.auth.GetTokenResult;
 import com.google.firebase.auth.GoogleAuthProvider;
 
+import io.fullstack.firestack.Utils;
+
 
 @SuppressWarnings("ThrowableResultOfMethodCallIgnored")
-class Auth extends ReactContextBaseJavaModule {
+public class FirestackAuth extends ReactContextBaseJavaModule {
   private final int NO_CURRENT_USER = 100;
   private final int ERROR_FETCHING_TOKEN = 101;
   private final int ERROR_SENDING_VERIFICATION_EMAIL = 102;
@@ -43,7 +45,7 @@ class Auth extends ReactContextBaseJavaModule {
   private FirebaseAuth mAuth;
   private FirebaseAuth.AuthStateListener mAuthListener;
 
-  public Auth(ReactApplicationContext reactContext) {
+  public FirestackAuth(ReactApplicationContext reactContext) {
     super(reactContext);
     mReactContext = reactContext;
     mAuth = FirebaseAuth.getInstance();