WIP: Add ancillary factory fragment

.build/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kiwicom/react-native-app-hotels",
-  "version": "0.0.53",
+  "version": "0.0.54",
   "private": false,
   "main": "index.js",
   "dependencies": {

android/playground/build.gradle

@@ -35,13 +35,13 @@ android {
             keyAlias 'my-key-alias'
             keyPassword 'kiwireactnative'
         }
-        release {
-            // Just a fake keystore / fake password
-            storeFile file("playground-key.keystore")
-            storePassword 'kiwireactnative'
-            keyAlias 'my-key-alias'
-            keyPassword 'kiwireactnative'
-        }
+//        release {
+//            // Just a fake keystore / fake password
+//            storeFile file("playground-key.keystore")
+//            storePassword 'kiwireactnative'
+//            keyAlias 'my-key-alias'
+//            keyPassword 'kiwireactnative'
+//        }
     }
     buildTypes {
         debug {
@@ -56,13 +56,13 @@ android {
             signingConfig signingConfigs.stagingRelease
             matchingFallbacks = ['release']
         }
-        release {
-            buildConfigField "String", "CODEPUSH_KEY", "\"${productionCodePushKey}\""
-            buildConfigField "String", "CODEPUSH_VERSION", "\"${codePushVersion}\""
-            minifyEnabled false
-            signingConfig signingConfigs.release
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-        }
+//        release {
+//            buildConfigField "String", "CODEPUSH_KEY", "\"${productionCodePushKey}\""
+//            buildConfigField "String", "CODEPUSH_VERSION", "\"${codePushVersion}\""
+//            minifyEnabled false
+//            signingConfig signingConfigs.release
+//            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+//        }
     }
     compileOptions {
         sourceCompatibility 1.8
@@ -108,12 +108,12 @@ dependencies {
         exclude group: "com.google.firebase"
     }
 
-    releaseImplementation("com.trinerdis.skypicker:rnkiwimobile:$rnKiwiMobileVersion-SNAPSHOT") {
-        exclude group: "com.android.support"
-        exclude group: "com.google.android.gms"
-        exclude group: "com.google.firebase"
-    }
-    releaseImplementation("com.kiwi.android:hermesvm:$hermesVmVersion-SNAPSHOT")
+//    releaseImplementation("com.trinerdis.skypicker:rnkiwimobile:$rnKiwiMobileVersion-SNAPSHOT") {
+//        exclude group: "com.android.support"
+//        exclude group: "com.google.android.gms"
+//        exclude group: "com.google.firebase"
+//    }
+//    releaseImplementation("com.kiwi.android:hermesvm:$hermesVmVersion-SNAPSHOT")
 
     implementation "com.google.android.gms:play-services-maps:$playServicesMapsVersion"
 

android/playground/src/main/AndroidManifest.xml

@@ -35,6 +35,8 @@
         </activity>
         <activity android:name="com.kiwi.mobile.rnandroidplayground.HotelsActivityFragment">
         </activity>
+        <activity android:name="com.kiwi.mobile.rnandroidplayground.AncillaryFactoryAcivity">
+        </activity>
         <activity android:name=".HotelsStay22Activity" />
         <activity android:name="com.kiwi.mobile.rnandroidplayground.AccountSettingsActivity" />
         <activity android:name="com.kiwi.mobile.rnandroidplayground.AccountPriceAlertsActivity" />

android/playground/src/main/java/com/kiwi/mobile/rnandroidplayground/AncillaryFactoryAcivity.kt

@@ -0,0 +1,59 @@
+package com.kiwi.mobile.rnandroidplayground
+
+import android.annotation.TargetApi
+import android.os.Build
+import android.os.Bundle
+import com.facebook.react.modules.core.DefaultHardwareBackBtnHandler
+import com.facebook.react.modules.core.PermissionAwareActivity
+import androidx.appcompat.app.AppCompatActivity
+import com.facebook.react.modules.core.PermissionListener
+
+
+class AncillaryFactoryAcivity : AppCompatActivity(), DefaultHardwareBackBtnHandler, PermissionAwareActivity {
+
+    private var mPermissionListener: PermissionListener? = null
+
+    companion object {
+        fun getViewModelClass(): Class<AncillaryFactoryAcivity> =
+                AncillaryFactoryAcivity::class.java
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_fragment)
+
+        if (savedInstanceState == null) {
+            addFragment()
+        }
+    }
+
+    private fun addFragment() {
+        val fragmentManager = getSupportFragmentManager()
+        fragmentManager.beginTransaction().add(R.id.container_main, AncillaryFactoryFragment()).commit()
+    }
+
+    // region BackButton
+    override fun invokeDefaultOnBackPressed() {
+        super.onBackPressed()
+    }
+
+    override fun onBackPressed() {
+        (application as PlaygroundApplication).reactNativeHost.reactInstanceManager.onBackPressed()
+    }
+    // endregion
+
+    // region PermissionAwareActivity
+    override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<String>, grantResults: IntArray) {
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults)
+        if (mPermissionListener != null && mPermissionListener!!.onRequestPermissionsResult(requestCode, permissions, grantResults)) {
+            mPermissionListener = null
+        }
+    }
+
+    @TargetApi(Build.VERSION_CODES.M)
+    override fun requestPermissions(permissions: Array<String>, requestCode: Int, listener: PermissionListener) {
+        mPermissionListener = listener
+        requestPermissions(permissions, requestCode)
+    }
+    // endregion
+}

android/playground/src/main/java/com/kiwi/mobile/rnandroidplayground/AncillaryFactoryFragment.kt

@@ -0,0 +1,12 @@
+package com.kiwi.mobile.rnandroidplayground
+
+import com.facebook.react.ReactNativeHost
+import com.kiwi.rnkiwimobile.ancillaries.RNAncillaryFactoryFragment
+import com.kiwi.rnkiwimobile.ancillaries.RNAncillaryFactoryInitialProperties
+
+
+class AncillaryFactoryFragment: RNAncillaryFactoryFragment(
+        RNAncillaryFactoryInitialProperties(service = "fast_track", bookingId = 123, kwAuthToken = "mock")) {
+
+    override fun getReactNativeHost(): ReactNativeHost = (activity?.application as PlaygroundApplication).reactNativeHost
+}

android/playground/src/main/java/com/kiwi/mobile/rnandroidplayground/HotelsActivityFragment.kt

@@ -25,10 +25,10 @@ class HotelsActivityFragment : Activity(), DefaultHardwareBackBtnHandler, Permis
     if (savedInstanceState == null) {
       val hotelFragment = HotelsFragment()
 
-      fragmentManager
-          .beginTransaction()
-          .add(R.id.container_main, hotelFragment)
-          .commit()
+//      fragmentManager
+//          .beginTransaction()
+//          .add(R.id.container_main, hotelFragment)
+//          .commit()
     }
   }
 

android/playground/src/main/java/com/kiwi/mobile/rnandroidplayground/HotelsFragment.kt

@@ -1,8 +1,8 @@
 package com.kiwi.mobile.rnandroidplayground
 
-import com.facebook.react.ReactNativeHost
+import  com.facebook.react.ReactNativeHost
 import com.kiwi.rnkiwimobile.hotels.RNHotelsFragment
 
 class HotelsFragment : RNHotelsFragment(HotelsData.getInitialProperties()) {
-  override fun getReactNativeHost(): ReactNativeHost = (activity.application as PlaygroundApplication).reactNativeHost
+  override fun getReactNativeHost(): ReactNativeHost = (activity?.application as PlaygroundApplication).reactNativeHost
 }

android/playground/src/main/java/com/kiwi/mobile/rnandroidplayground/MainActivity.kt

@@ -31,6 +31,10 @@ class MainActivity : AppCompatActivity() {
     button_account_price_alerts.setOnClickListener {
       startActivity(Intent(this, AccountPriceAlertsActivity.getViewModelClass()))
     }
+
+    button_ancillary_factory.setOnClickListener {
+      startActivity(Intent(this, AncillaryFactoryAcivity.getViewModelClass()))
+    }
   }
 
   override fun onDestroy() {

android/playground/src/main/res/layout/activity_main.xml

@@ -39,4 +39,10 @@
         android:layout_height="wrap_content"
         android:text="Account price alerts" />
 
+    <Button
+        android:id="@+id/button_ancillary_factory"
+        android:layout_width="199dp"
+        android:layout_height="wrap_content"
+        android:text="ancillary factory" />
+
 </LinearLayout>

android/rnkiwimobile/build.gradle

@@ -81,7 +81,7 @@ dependencies {
     def hermesPath = "../../node_modules/hermesvm/android/";	
     debugImplementation files(hermesPath + "hermes-debug.aar")	
     stagingReleaseImplementation files(hermesPath + "hermes-release.aar")
-    releaseImplementation "com.kiwi.android:hermesvm:$hermesVmVersion-SNAPSHOT"
+//    releaseImplementation "com.kiwi.android:hermesvm:$hermesVmVersion-SNAPSHOT"
     implementation "com.kiwi.android:android-jsc:$jscVersion-SNAPSHOT"
 }
 

android/rnkiwimobile/src/main/java/com/kiwi/rnkiwimobile/RNKiwiFragment.kt

@@ -6,11 +6,11 @@ package com.kiwi.rnkiwimobile
  * Copyright 2017 Agile Sports Technologies, Inc.
  */
 
-import android.app.Fragment
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.fragment.app.Fragment
 import com.facebook.react.ReactNativeHost
 import com.facebook.react.ReactRootView
 import com.facebook.react.devsupport.DoubleTapReloadRecognizer

android/rnkiwimobile/src/main/java/com/kiwi/rnkiwimobile/ancillaries/RNAncillaryFactoryFragment.kt

@@ -0,0 +1,12 @@
+package com.kiwi.rnkiwimobile.ancillaries
+
+import com.kiwi.rnkiwimobile.RNKiwiFragment;
+
+abstract  class RNAncillaryFactoryFragment(
+    initialProperties: RNAncillaryFactoryInitialProperties) : RNKiwiFragment(
+        RNAncillaryFactoryModule.getInitialProperties(initialProperties)) {
+
+    override fun getModuleName(): String {
+        return RNAncillaryFactoryModule.moduleName
+    }
+}

android/rnkiwimobile/src/main/java/com/kiwi/rnkiwimobile/ancillaries/RNAncillaryFactoryInitialProperties.kt

@@ -0,0 +1,7 @@
+package com.kiwi.rnkiwimobile.ancillaries
+
+data class RNAncillaryFactoryInitialProperties(
+        val service: String,
+        val bookingId: Int,
+        val kwAuthToken: String
+)

android/rnkiwimobile/src/main/java/com/kiwi/rnkiwimobile/ancillaries/RNAncillaryFactoryModule.kt

@@ -0,0 +1,18 @@
+package com.kiwi.rnkiwimobile.ancillaries
+
+import android.os.Bundle
+
+object RNAncillaryFactoryModule {
+    const val jsEntryPoint = "app/native"
+    const val moduleName = "AncillaryFactory"
+
+    fun getInitialProperties(initialProperties: RNAncillaryFactoryInitialProperties): Bundle? {
+        return Bundle().apply {
+            putString("service", initialProperties.service)
+            putInt("bookingId", initialProperties.bookingId)
+            putString("kwAuthToken", initialProperties.kwAuthToken)
+        }
+
+    }
+
+}

package.json

@@ -102,7 +102,7 @@
     "test-runner": "jest"
   },
   "rnkiwimobile": {
-    "code-push-target-binary-version": "16.0.0"
+    "code-push-target-binary-version": "17.0.0"
   },
   "resolutions": {
     "@adeira/js": "^0.2.0"