first version, v0.2

Author: efraespada

app/build.gradle

@@ -1,7 +1,5 @@
 apply plugin: 'com.android.application'
-
 apply plugin: 'kotlin-android'
-
 apply plugin: 'kotlin-android-extensions'
 
 android {
@@ -25,7 +23,7 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation"org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
-    implementation 'com.android.support:appcompat-v7:27.1.0'
+    implementation 'com.android.support:appcompat-v7:27.1.1'
     implementation 'com.android.support.constraint:constraint-layout:1.0.2'
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'com.android.support.test:runner:1.0.1'

build.gradle

@@ -1,8 +1,8 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.2.30'
-    ext.rotor_version = '0.1.2'
+    ext.kotlin_version = '1.2.41'
+    ext.rotor_version = '0.2'
 
     repositories {
         google()
@@ -12,10 +12,10 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.1'
+        classpath 'com.android.tools.build:gradle:3.1.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.1"
-        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Sat Mar 24 17:56:41 CET 2018
+#Mon Jun 04 01:36:22 CEST 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip

notifications/build.gradle

@@ -4,6 +4,8 @@ apply plugin: 'com.github.dcendents.android-maven'
 apply plugin: 'com.jfrog.bintray'
 
 version = rotor_version
+group = "com.rotor"
+
 
 android {
     compileSdkVersion 27
@@ -12,7 +14,7 @@ android {
         minSdkVersion 21
         targetSdkVersion 27
         versionCode 1
-        versionName version
+        versionName rotor_version
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
 
@@ -28,27 +30,32 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
-    implementation 'com.android.support:appcompat-v7:27.1.0'
+    implementation 'com.android.support:appcompat-v7:27.1.1'
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'com.android.support.test:runner:1.0.1'
     androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
 
-    implementation "com.android.support:support-compat:27.1.0"
-    compile "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    // compile project(":core")
-    // compile project(":database")
-    implementation 'com.rotor:core:0.1.1@aar'
-    compile ('com.rotor:database:0.1.1@aar') {
+    implementation "com.android.support:support-compat:27.1.1"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    // implementation project(":core")
+    // implementation project(":database")
+
+    implementation ('com.rotor:core:0.2@aar') {
+        transitive = true
+    }
+    implementation ('com.rotor:database:0.2@aar') {
         transitive = true
     }
-    compile 'com.google.code.gson:gson:2.8.2'
-    compile 'com.nostra13.universalimageloader:universal-image-loader:1.9.5'
-    compile "com.stringcare:library:0.7"
-
-    compile "com.squareup.retrofit2:retrofit:2.3.0"
-    compile "com.squareup.retrofit2:adapter-rxjava2:2.3.0"
-    compile "com.squareup.retrofit2:converter-gson:2.3.0"
-    compile "io.reactivex.rxjava2:rxandroid:2.0.2"
+    implementation 'com.google.code.gson:gson:2.8.2'
+    implementation 'com.nostra13.universalimageloader:universal-image-loader:1.9.5'
+    implementation "com.stringcare:library:0.7"
+
+    implementation 'org.apache.commons:commons-lang3:3.6'
+
+    implementation "com.squareup.retrofit2:retrofit:2.3.0"
+    implementation "com.squareup.retrofit2:adapter-rxjava2:2.3.0"
+    implementation "com.squareup.retrofit2:converter-gson:2.3.0"
+    implementation "io.reactivex.rxjava2:rxandroid:2.0.2"
 }
 
 repositories {
@@ -58,15 +65,13 @@ repositories {
 def siteUrl = 'https://github.com/rotorlab/notifications-kotlin'
 def gitUrl = 'https://github.com/rotorlab/notifications-kotlin.git'
 
-group = "com.rotor"
-
 install {
     repositories.mavenInstaller {
         // This generates POM.xml with proper parameters
         pom {
             project {
                 packaging 'aar'
-                name 'Database module for Rotor client (kotlin)'
+                name 'Notifications module for Rotor client (kotlin)'
                 url siteUrl
                 // Set your license
                 licenses {

notifications/src/main/java/com/rotor/notifications/NotificationRouterActivity.kt

@@ -1,24 +1,26 @@
 package com.rotor.notifications
 
-import android.content.Intent
 import android.os.Bundle
 import android.support.v7.app.AppCompatActivity
+import com.rotor.core.Rotor
 
 /**
  * Created by efraespada on 23/03/2018.
  */
 abstract class NotificationRouterActivity : AppCompatActivity() {
 
+    var enter: Boolean ? = false
+
     interface NotificationsStatus {
         fun ready()
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-
+        enter = true
         var requestCode : Int ? = null
         var id : String ? = null
-        var data : String ? = null
+        var room : String ? = null
         if (intent.hasExtra(Notifications.ID)) {
             id = intent.getStringExtra(Notifications.ID)
             if (id == null){
@@ -28,24 +30,37 @@ abstract class NotificationRouterActivity : AppCompatActivity() {
         if (intent.hasExtra(Notifications.RC)) {
             requestCode = intent.getIntExtra(Notifications.RC, 0)
         }
-        if (intent.hasExtra(Notifications.DATA)) {
-            data = intent.getStringExtra(Notifications.DATA)
-            if (data == null){
-                data = ""
+        if (intent.hasExtra(Notifications.ROOM)) {
+            room = intent.getStringExtra(Notifications.ROOM)
+            if (room == null){
+                room = ""
             }
         }
 
         Notifications.listener(object : NotificationsStatus {
             override fun ready() {
-                notificationTouched(requestCode!!, id!!, data!!)
+                if (enter != null && enter as Boolean) {
+                    notificationTouched(requestCode!!, id!!, room!!)
+                }
+                enter = false
             }
         })
 
-        onCreate(savedInstanceState, requestCode!!, id!!, data!!)
+        onCreate()
     }
 
-    abstract fun notificationTouched(action: Int, id: String, data: String)
+    abstract fun notificationTouched(action: Int, id: String, room: String)
+
+    abstract fun onCreate()
 
-    abstract fun onCreate(savedInstanceState: Bundle?, action: Int, id: String, data: String)
+    override fun onResume() {
+        super.onResume()
+        Rotor.onResume()
+    }
+
+    override fun onPause() {
+        Rotor.onPause()
+        super.onPause()
+    }
 
 }