Merge branch 'develop'

dmdevgo · Jun 25, 2019 · 9bb7381 · 9bb7381
2 parents 7ab0320 + d061f8e
commit 9bb7381
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 33 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,11 +1,11 @@
 buildscript {
-    ext.kotlinVersion = '1.3.21'
+    ext.kotlinVersion = '1.3.40'
     repositories {
         google()
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.2'
+        classpath 'com.android.tools.build:gradle:3.4.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
     }
 }
@@ -36,7 +36,7 @@ ext {
 
     kotlinStdlib = "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
 
-    rxJava2 = "io.reactivex.rxjava2:rxjava:2.2.8"
+    rxJava2 = "io.reactivex.rxjava2:rxjava:2.2.10"
     rxRelay2 = "com.jakewharton.rxrelay2:rxrelay:2.1.0"
     rxAndroid2 = "io.reactivex.rxjava2:rxandroid:2.1.0"
 

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Thu Mar 28 23:45:32 MSK 2019
+#Wed Jun 26 00:22:48 MSK 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
diff --git a/rxpm/build.gradle b/rxpm/build.gradle
@@ -72,7 +72,7 @@ ext {
     bintrayName = 'RxPM'
     publishedGroupId = 'me.dmdev.rxpm'
     artifact = 'rxpm'
-    libraryVersion = '1.2.4'
+    libraryVersion = '1.2.5'
     gitUrl = 'https://github.com/dmdevgo/RxPM'
     allLicenses = ['MIT']
 }

diff --git a/rxpm/src/main/kotlin/me/dmdev/rxpm/map/base/MapPmSupportFragment.kt b/rxpm/src/main/kotlin/me/dmdev/rxpm/map/base/MapPmSupportFragment.kt
@@ -1,17 +1,13 @@
 package me.dmdev.rxpm.map.base
 
-import android.os.Bundle
-import android.support.v4.app.Fragment
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import com.google.android.gms.maps.GoogleMap
-import com.google.android.gms.maps.MapView
-import io.reactivex.disposables.CompositeDisposable
-import me.dmdev.rxpm.PresentationModel
-import me.dmdev.rxpm.map.MapPmExtension
-import me.dmdev.rxpm.map.MapPmView
-import me.dmdev.rxpm.map.delegate.MapPmSupportFragmentDelegate
+import android.os.*
+import android.support.v4.app.*
+import android.view.*
+import com.google.android.gms.maps.*
+import io.reactivex.disposables.*
+import me.dmdev.rxpm.*
+import me.dmdev.rxpm.map.*
+import me.dmdev.rxpm.map.delegate.*
 
 /**
  * Predefined [Fragment] implementing the [MapPmView].
@@ -40,12 +36,17 @@ abstract class MapPmSupportFragment<PM> : Fragment(), MapPmView<PM>
         delegate.onCreate(savedInstanceState)
     }
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return super.onCreateView(inflater, container, savedInstanceState).apply {
-            delegate.onCreateView(this!!, savedInstanceState)
-        }
+    final override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        val view =  createView(inflater, container, savedInstanceState)
+        delegate.onCreateView(view, savedInstanceState)
+        return view
     }
 
+    /**
+     * Replaces the [onCreateView] that the library hides for internal use.
+     */
+    abstract fun createView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View
+
     override fun onStart() {
         super.onStart()
         delegate.onStart()

diff --git a/sample/src/main/kotlin/me/dmdev/rxpm/sample/main/MainActivity.kt b/sample/src/main/kotlin/me/dmdev/rxpm/sample/main/MainActivity.kt
@@ -1,16 +1,15 @@
 package me.dmdev.rxpm.sample.main
 
-import android.os.Bundle
-import android.support.v7.app.AppCompatActivity
-import me.dmdev.rxpm.navigation.NavigationMessage
-import me.dmdev.rxpm.navigation.NavigationMessageHandler
-import me.dmdev.rxpm.sample.R
+import android.os.*
+import android.support.v7.app.*
+import me.dmdev.rxpm.navigation.*
+import me.dmdev.rxpm.sample.*
 import me.dmdev.rxpm.sample.main.extensions.*
-import me.dmdev.rxpm.sample.main.ui.base.BackHandler
-import me.dmdev.rxpm.sample.main.ui.confirmation.CodeConfirmationScreen
-import me.dmdev.rxpm.sample.main.ui.country.ChooseCountryScreen
-import me.dmdev.rxpm.sample.main.ui.main.MainScreen
-import me.dmdev.rxpm.sample.main.ui.phone.AuthByPhoneScreen
+import me.dmdev.rxpm.sample.main.ui.base.*
+import me.dmdev.rxpm.sample.main.ui.confirmation.*
+import me.dmdev.rxpm.sample.main.ui.country.*
+import me.dmdev.rxpm.sample.main.ui.main.*
+import me.dmdev.rxpm.sample.main.ui.phone.*
 
 
 class MainActivity : AppCompatActivity(), NavigationMessageHandler {
@@ -45,8 +44,8 @@ class MainActivity : AppCompatActivity(), NavigationMessageHandler {
             is ChooseCountryMessage -> sfm.openScreen(ChooseCountryScreen())
 
             is CountryChosenMessage -> {
-                sfm.findScreen<AuthByPhoneScreen>()?.onCountryChosen(message.country)
                 sfm.back()
+                sfm.findScreen<AuthByPhoneScreen>()?.onCountryChosen(message.country)
             }
 
             is PhoneSentSuccessfullyMessage -> sfm.openScreen(