Merge branch 'master' of https://github.com/rosariopfernandes/fireXtensions

� Conflicts:
�	.idea/codeStyles/Project.xml

Author: thatfiredev

.idea/caches/build_file_checksums.ser

@@ -5,17 +5,9 @@
   ],
   "content": "README.md",
   "pages" : {
-    "tutorials/realtime-database.md": "Realtime Database Tutorial",
-    "tutorials/cloud-firestore.md": "Cloud Firestore Tutorial",
-    "docs/README.md": "Reference Docs"
+    "docs/analytics.md": "Analytics fireXtensions"
   },
   "related": [
     "firebase/firebase-android-sdk"
-  ],
-  "tabs": [
-    {
-      "title": "Reference Docs",
-      "href": "http://rosariopfernandes.me/fireXtensions/"
-    }
   ]
 }

.idea/misc.xml

@@ -3,188 +3,16 @@ https://firebaseopensource.com/projects/rosariopfernandes/firextensions
 )
 [![](https://jitpack.io/v/rosariopfernandes/fireXtensions.svg)](https://jitpack.io/#rosariopfernandes/fireXtensions)
 
-# fireXtensions [DEPRECATED]
-
-**THIS LIBRARY IS NOW DEPRECATED IN FAVOR OF THE
- [OFFICIAL FIREBASE KTX LIBRARIES](https://firebaseopensource.com/projects/firebase/firebase-android-sdk/#kotlin_extensions).**
-
- **PLEASE NOTE THAT NOT ALL THE FIREXTENSIONS ARE PRESENT IN THE OFFICIAL KTX, THAT'S BECAUSE SOME
- FIREXTENSIONS WOULD CAUSE MEMORY LEAKS WHILE OTHER SIMPLY DID NOT ADD MUCH VALUE TO THE SDK. IF YOU FIND
- A FIREXTENSION WITH NO CORRESPONDING KTX, YOU'LL HAVE TO STICK TO THE OFFICIAL KOTLIN USAGE.
- APOLOGIES FOR THAT.**
-
- **THANKS FOR EVERYONE WHO CONTRIBUTED, SUPPORTED OR USED FIREXTENSIONS!**
+# fireXtensions
 
 ## Introduction
 
 fireXtensions are a set of Kotlin extension functions that aim to simplify the way you use the
  Firebase SDK for Android.
 
-### Realtime Database
-See all examples on the [Tutorial](tutorials/realtime-database.md).
-
-**Kotlin**
-```kotlin
-ref.addValueEventListener(object: ValueEventListener {
-    override fun onDataChange(dataSnapshot: DataSnapshot) {
-        val data = dataSnapshot.getValue(String::class.java)
-        //Update the UI with received data
-    }
-
-    override fun onCancelled(error: DatabaseError) {
-        //print error.message
-    }
-})
-```
-
-**fireXtensions**
-```kotlin
-ref.observe<DataSnapshot> { dataSnapshot, _ ->
-    dataSnapshot?.let {
-        val data = dataSnapshot.getValue(String::class.java)
-        //Update the UI with received data
-    }
-}
-```
-----
-**Kotlin**
-```kotlin
-ref.addValueEventListener(object: ValueEventListener {
-    override fun onDataChange(dataSnapshot: DataSnapshot) {
-        val todo = dataSnapshot.getValue(Todo::class.java)
-        //Update the UI with received data
-    }
-
-    override fun onCancelled(error: DatabaseError) {
-        //print error.message
-    }
-})
-```
-
-**fireXtensions**
-```kotlin
-ref.observe<Todo> { todo, _ ->
-    todo?.let {
-        //Update the UI with received data
-    }
-}
-```
-----
-
-**Kotlin**
-```kotlin
-ref.addValueEventListener(object: ValueEventListener {
-    override fun onDataChange(dataSnapshot: DataSnapshot) {
-        val todos = ArrayList<Todo>()
-        for (snapshot in dataSnapshot.children) {
-            val todo = dataSnapshot.getValue(Todo::class.java)
-            todos.add(todo!!)
-        }
-        //Update the UI with received list
-    }
-
-    override fun onCancelled(error: DatabaseError) {
-        //print error.message
-    }
-})
-```
-**fireXtensions**
-```kotlin
-ref.observeChildren<Todo> { todos, error ->
-    todos?.let {
-        //Update the UI with received list
-    }
-    error.let {
-        //print error.message
-    }
-}
-```
-More can be found on the [Tutorial](tutorials/realtime-database.md).
-
-----
-
-### Cloud Firestore
-See all examples on the [Tutorial](tutorials/cloud-firestore.md).
-
-**Kotlin**
-```kotlin
-val docRef = db.collection("cities").document("SF")
-// Source can be CACHE, SERVER or DEFAULT
-docRef.get(Source.CACHE).addOnCompleteListener { task ->
-    if (task.isSuccessful()) {
-        val document = task.result
-        if (document.exists()) {
-            Log.d(TAG, "DocumentSnapshot data: " + document.data)
-        } else {
-            Log.d(TAG, "No such document")
-        }
-    } else {
-        Log.d(TAG, "get failed with ", task.exception)
-    }
-}
-```
-
-**fireXtensions**
-```kotlin
-// Source can be CACHE, SERVER or DEFAULT
-docRef.getDocument<DocumentSnapshot>(Source.CACHE) { document, exception ->
-    document?.let {
-        Log.d(TAG, "DocumentSnapshot data: " + document.data)
-    }
-    exception?.let {
-        Log.d(TAG, "get failed with ", exception)
-    }
-}
-```
-----
-
-**Kotlin**
-```kotlin
-val docRef = db.collection("cities").document("BJ")
-docRef.get().addOnCompleteListener { task ->
-    if (task.isSuccessful()) {
-        val city = task.result.toObject(City::class.java)
-        //Update UI with city
-    }
-}
-```
-
-**fireXtensions**
-```kotlin
-docRef.getDocument<City>() { city, _ ->
-    city?.let {
-        //update UI with city
-    }
-}
-```
-More can be found on the [Tutorial](tutorials/cloud-firestore.md).
-
-
-## Getting Started
-Step 1 - Add the jitpack maven in your root build.gradle at the end of repositories:
-```gradle
-    allprojects {
-        repositories {
-            ...
-            maven { url 'https://jitpack.io' }
-        }
-    }
-```
-Step 2 - Add **one** of the dependencies to your app's build.gradle:
-```gradle
-    dependencies {
-        // You can either import the whole library
-        implementation 'com.github.rosariopfernandes:fireXtensions:0.3.4'
-
-        // or import database extensions only
-        implementation 'com.github.rosariopfernandes.fireXtensions:database:0.3.4'
-
-        // or import firestore extensions only
-        implementation 'com.github.rosariopfernandes.fireXtensions:firestore:0.3.4'
-    }
-```
+## Available modules
 
-Reference Docs: [rosariopfernandes.me/fireXtensions](http://rosariopfernandes.me/fireXtensions/)
+- [Analytics](docs/analytics.md)
 
 ## Contributing
 Anyone and everyone is welcome to contribute. Please take a moment to
@@ -193,7 +21,5 @@ review the [contributing guidelines](CONTRIBUTING.md).
 ## License
 This project is licensed under the MIT License - see the [LICENSE.md](LICENSE.md) file for details
 
-## Acknowledgments
-* Inspired by [Android KTX](https://github.com/android/android-ktx)
-* Some function names are based on the
- [Official Firebase SDK for iOS](https://firebase.google.com/docs/database/ios/read-and-write).
+## Acknowledgment
+Inspired by [Firebase KTX](https://firebaseopensource.com/projects/firebase/firebase-android-sdk/#kotlin_extensions)

.idea/modules.xml

@@ -0,0 +1 @@
+/build

.opensource/project.json

@@ -0,0 +1,52 @@
+apply plugin: 'com.android.library'
+apply plugin: 'com.github.dcendents.android-maven'
+group='io.github.rosariopfernandes'
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-android-extensions'
+apply plugin: 'org.jetbrains.dokka-android'
+
+android {
+    compileSdkVersion 29
+    buildToolsVersion "29.0.0"
+
+
+    defaultConfig {
+        minSdkVersion 16
+        targetSdkVersion 29
+        versionCode 1
+        versionName '$firextensions_version'
+
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        consumerProguardFiles 'consumer-rules.pro'
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+    }
+
+}
+
+dependencies {
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation 'androidx.core:core-ktx:1.2.0'
+
+    implementation 'com.google.firebase:firebase-common-ktx:19.3.0'
+    implementation 'com.google.firebase:firebase-analytics:17.2.3'
+
+
+    testImplementation 'junit:junit:4.12'
+    testImplementation 'org.robolectric:robolectric:4.3.1'
+    testImplementation 'androidx.test:core:1.2.0'
+    testImplementation "com.google.truth:truth:1.0"
+    androidTestImplementation 'androidx.test:runner:1.2.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
+}
+
+dokka {
+    outputDirectory = "docs/reference"
+}

README.md

@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile

analytics/.gitignore

@@ -0,0 +1,2 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="io.github.rosariopfernandes.firextensions.analytics" />