M0.9.2erge branch 'release/0.9.2'

app/build.gradle

@@ -16,6 +16,16 @@ apply plugin: 'com.google.firebase.crashlytics'
 
 //apply plugin: 'io.fabric'
 
+// Create a variable called keystorePropertiesFile, and initialize it to your
+// keystore.properties file, in the rootProject folder.
+
+
+// Initialize a new Properties() object called keystoreProperties.
+def keystoreProperties = new Properties()
+
+// Load your keystore.properties file into the keystoreProperties object.
+
+
 android {
     compileSdkVersion compileSdkVersion_RoomPark
     defaultConfig {
@@ -30,7 +40,23 @@ android {
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
+    signingConfigs {
+        release {
+            def keystorePropertiesFile = rootProject.file("../roomParkKeystore.properties")
+            if ( keystorePropertiesFile.exists() ){
+                keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
+                keyAlias keystoreProperties['keyAlias']
+                keyPassword keystoreProperties['keyPassword']
+                storeFile file(keystoreProperties['storeFile'])
+                storePassword keystoreProperties['storePassword']
+            }
 
+//            else throw new GradleException('Plesase, provide keystore properties file! ')
+            // You need to specify either an absolute path or include the
+            // keystore file in the same directory as the build.gradle file.
+
+        }
+    }
 
     buildTypes {
         debug {
@@ -38,11 +64,36 @@ android {
             ext.alwaysUpdateBuildId = false
         }
         release {
+            signingConfig signingConfigs.release
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
             debuggable false
         }
     }
+
+
+    applicationVariants.all { variant ->
+        if (variant.name.contains("release")) {
+            variant.outputs.each { output ->
+                output.outputFileName  = new File(
+                        "Expeditor_v")
+            }
+        }
+    }
+
+    task renameBundle(type: Copy) {
+        from "$buildDir/outputs/bundle/release"
+        into "../../"
+
+        String name = findProperty('newBundleName')
+        rename 'app-release.aab', "${name}.aab"
+    }
+
+    task publishRelease(type: GradleBuild) {
+        tasks = ['bundleRelease']
+    }
+
+
     androidExtensions {
         experimental = true
     }

app/src/main/java/com/biganto/visual/roompark/player/unity_utils/IBigantoUnityPlugin.java

@@ -8,7 +8,4 @@ public interface IBigantoUnityPlugin{
     public void sendUnityPauseRequest(String request);
     public void sendUnityErrorRequest(String request);
     public void sendUnityChangeOrientationRequest(String request);
-//    void onTourSceneLoaded();
-//    void onTourScenePrepared(TourPlayerCallback callback);
-//    void onTourLoaded(TourReadyCallback callback);
 }

app/src/main/java/com/biganto/visual/roompark/presentation/screen/auth/ScreenController.kt

@@ -2,11 +2,13 @@ package com.biganto.visual.roompark.presentation.screen.auth
 
 import android.view.View
 import butterknife.BindView
+import butterknife.OnClick
 import com.biganto.visual.roompark.R
 import com.biganto.visual.roompark.base.RoomParkApplication
 import com.biganto.visual.roompark.base.RoomParkMainActivity
 import com.biganto.visual.roompark.conductor.BigantoBaseController
 import com.biganto.visual.roompark.presentation.screen.home.home_routing.HomeBottomNavigationController
+import com.biganto.visual.roompark.util.extensions.startUrl
 import com.bluelinelabs.conductor.RouterTransaction
 import com.google.android.material.button.MaterialButton
 import com.google.android.material.textfield.TextInputLayout
@@ -22,6 +24,8 @@ import javax.inject.Inject
  * Created by Vladislav Bogdashkin on 30.09.2019.
  */
 
+private const val RESTORE_PASS_URL = "https://room-park.ru/users/remind/"
+
 class AuthScreenController  :
     BigantoBaseController<AuthScreenViewState
         , AuthScreen
@@ -37,6 +41,12 @@ class AuthScreenController  :
     @BindView(R.id.login_text_input) lateinit var loginInput:TextInputLayout
     @BindView(R.id.password_text_input) lateinit var pwdInput:TextInputLayout
     @BindView(R.id.sign_in_button) lateinit var signInButton:MaterialButton
+    @BindView(R.id.restore_pass_button) lateinit var restoreButton:MaterialButton
+
+    @OnClick(R.id.restore_pass_button)
+    fun onRestorePass(){
+        activity?.startUrl(RESTORE_PASS_URL)
+    }
 
     override fun tryAuth(): Observable<AuthInputModel> =
             signInButton.clicks()

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

@@ -99,6 +99,7 @@
 
 
             <com.google.android.material.button.MaterialButton
+                android:id="@+id/restore_pass_button"
                 style="@style/AuthButton.Restore"
                 android:layout_width="wrap_content"
                 android:layout_height="40dp"

dependencies.gradle

@@ -5,8 +5,8 @@ ext {
     minSdkVersion_RoomPark = 23
     compileSdkVersion_RoomPark = 28
 
-    VERSION_CODE = 7
-    VERSION_NAME = "0.9.1"
+    VERSION_CODE = 8
+    VERSION_NAME = "0.9.2"
 
 //    supportLibraryVersion = '1.1.0-alpha05'
     constrainLayoutVersion = '1.1.3'

readme.md

 Room Park official Android application
 
- - - v.0.9.1 - -
+ - - v.0.9.2 - -
+
+# 0.9.2 --> 0.9.1
+  * universal untiy-mobile building support
+  * fix resotre url button
 
 Pre-release version