- Update in Kotlin version to 1.6.10

- Changed components to use Kotlin DSL

Author: ojaynico

README.md

@@ -1,6 +1,6 @@
 # ojaynico-kotlin-react-native
-[![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.github.ojaynico/ojaynico-kotlin-react-native/badge.svg)](https://search.maven.org/artifact/com.github.ojaynico/ojaynico-kotlin-react-native/1.1.7/pom)
-[![Kotlin](https://img.shields.io/badge/kotlin-1.6.0-blue.svg?logo=kotlin)](http://kotlinlang.org)
+[![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.github.ojaynico/ojaynico-kotlin-react-native/badge.svg)](https://search.maven.org/artifact/com.github.ojaynico/ojaynico-kotlin-react-native/1.1.9/pom)
+[![Kotlin](https://img.shields.io/badge/kotlin-1.6.10-blue.svg?logo=kotlin)](http://kotlinlang.org)
 [![npm version](https://img.shields.io/npm/v/react.svg?style=flat)](https://www.npmjs.com/package/react)
 [![npm version](https://img.shields.io/npm/v/react-native?color=brightgreen&label=npm%20package)](https://www.npmjs.com/package/react-native)
 [![Kotlin JS IR supported](https://img.shields.io/badge/Kotlin%2FJS-IR%20supported-yellow)](https://kotl.in/jsirsupported)
@@ -32,16 +32,21 @@ repositories {
 }
 
 dependencies {
-    implementation("com.github.ojaynico:ojaynico-kotlin-react-native:1.1.7")
+    implementation("com.github.ojaynico:ojaynico-kotlin-react-native:1.1.9")
 }
 ```
 
 ### `Example of a react native app using the above wrapper`
 
 ```kotlin
-import ojaynico.kotlin.react.*
-import ojaynico.kotlin.react.native.AppRegistry
-import react.*
+import ojaynico.kotlin.react.native.api.AppRegistry
+import ojaynico.kotlin.react.native.api.Platform
+import ojaynico.kotlin.react.native.component.ScrollView
+import ojaynico.kotlin.react.native.component.StyleSheet
+import ojaynico.kotlin.react.native.component.Text
+import ojaynico.kotlin.react.native.component.View
+import react.FC
+import react.Props
 
 val styles = StyleSheet.create(object {
     val body = object {
@@ -52,29 +57,28 @@ val styles = StyleSheet.create(object {
             val fontWeight = "600"
             val color = "#000"
     }
-}
+})
 
-class App : RComponent<Props, State>() {
-    override fun RBuilder.render() {
-        scrollView {
-            attrs.contentInsetAdjustmentBehavior = "automatic"
-            
-            view {
-                attrs.style = styles.body
+val App = FC<Props> {
+    ScrollView {
+        contentInsetAdjustmentBehavior = "automatic"
 
-                text("Welcome to Kotlin React Native") {
-                    style = styles.text
-                }
+        View {
+            style = styles.body
+
+            Text {
+                style = styles.text
+                +"Welcome to Kotlin React Native"
             }
         }
     }
 }
 
 fun main() {
     // For class components
-    AppRegistry.registerComponent("MyApp") { App::class.js }
+    //AppRegistry.registerComponent("MyApp") { App::class.js }
     // For functional components (Assume App is the functional component)
-    // AppRegistry.registerComponent("MyApp") { App }
+     AppRegistry.registerComponent("MyApp") { App }
 
     // Code below will work if you have added react native web dependency to your project. 
     // Visit how to set up react native web in your project for a detailed instruction.
@@ -87,6 +91,7 @@ fun main() {
 }
 ```
 
+## `NOTE: STILL UNDER DEVELOPMENT. USE ALTERNATIVE NAVIGATION`
 ### `Example using Navigation`
 
 ```kotlin

build.gradle.kts

@@ -1,12 +1,14 @@
+import org.jetbrains.kotlin.gradle.plugin.statistics.ReportStatisticsToElasticSearch.password
+
 plugins {
-    kotlin("js") version "1.6.0"
+    kotlin("js") version "1.6.10"
     id("maven-publish")
     id("io.codearte.nexus-staging") version "0.30.0"
     signing
 }
 
 group = "com.github.ojaynico"
-version = "1.1.7"
+version = "1.1.9"
 
 val artifactName = project.name
 val artifactGroup = project.group.toString()
@@ -30,7 +32,6 @@ val pomDeveloperEmail = "ojaynico@gmail.com"
 
 repositories {
     mavenCentral()
-    jcenter()
 }
 
 kotlin {
@@ -41,10 +42,10 @@ kotlin {
 }
 
 dependencies {
-    implementation("org.jetbrains.kotlin-wrappers:kotlin-react:17.0.2-pre.274-kotlin-1.6.0")
-    implementation("org.jetbrains.kotlin-wrappers:kotlin-extensions:1.0.1-pre.274-kotlin-1.6.0")
+    implementation("org.jetbrains.kotlin-wrappers:kotlin-react:17.0.2-pre.294-kotlin-1.6.10")
+    implementation("org.jetbrains.kotlin-wrappers:kotlin-extensions:1.0.1-pre.294-kotlin-1.6.10")
     implementation(npm("react", "17.0.2"))
-    implementation(npm("react-native", "0.66"))
+    implementation(npm("react-native", "0.67.2"))
 }
 
 val sourcesJar by tasks.registering(Jar::class) {

src/main/kotlin/ojaynico/kotlin/react/Extensions.kt

@@ -2,7 +2,7 @@
 
 package ojaynico.kotlin.react
 
-import ojaynico.kotlin.react.native.AppRegistry
+import ojaynico.kotlin.react.native.api.AppRegistry
 import react.Component
 
 // Components

src/main/kotlin/ojaynico/kotlin/react/NativeBuilder.kt

@@ -1,12 +1,9 @@
 package ojaynico.kotlin.react
 
 import ojaynico.kotlin.react.native.*
-import react.RBuilder
-import react.RElementBuilder
 import react.ReactNode
-import react.createElement
 
-fun RBuilder.view(handler: RElementBuilder<ViewProps>.() -> Unit) = child(View::class) {
+/*fun RBuilder.view(handler: RElementBuilder<ViewProps>.() -> Unit) = child(View::class) {
     handler()
 }
 
@@ -126,6 +123,6 @@ fun RBuilder.touchableNativeFeedback(handler: TouchableNativeFeedbackProps.() ->
 
 fun RBuilder.inputAccessoryView(handler: InputAccessoryViewProps.() -> Unit) = child(InputAccessoryView::class) {
     attrs(handler)
-}
+}*/
 
 typealias ComponentProvider = () -> dynamic

src/main/kotlin/ojaynico/kotlin/react/NavigatorBuilder.kt

@@ -1,16 +1,14 @@
 package ojaynico.kotlin.react
 
-import ojaynico.kotlin.react.navigator.Navigator
-import ojaynico.kotlin.react.navigator.NavigatorProps
-import ojaynico.kotlin.react.navigator.Route
-import ojaynico.kotlin.react.navigator.RouteProps
-import react.RBuilder
-import react.RElementBuilder
-
+/*
 fun RBuilder.navigator(handler: RElementBuilder<NavigatorProps>.() -> Unit) = child(Navigator::class) {
     handler()
 }
 
 fun RBuilder.route(handler: RElementBuilder<RouteProps>.() -> Unit) = child(Route) {
     handler()
 }
+
+fun ChildrenBuilder.nico(handler: NavigatorProps) = child(Navigator::class) {
+    handler
+}*/

src/main/kotlin/ojaynico/kotlin/react/native/Api.kt renamed to src/main/kotlin/ojaynico/kotlin/react/native/api/Api.kt

@@ -1,10 +1,12 @@
 @file:JsModule("react-native")
 @file:Suppress("unused")
 
-package ojaynico.kotlin.react.native
+package ojaynico.kotlin.react.native.api
 
 import ojaynico.kotlin.react.ComponentProvider
+import ojaynico.kotlin.react.native.component.*
 import react.Component
+import react.FC
 import react.Props
 import react.State
 import kotlin.js.Promise
@@ -24,6 +26,8 @@ external class Alert: Component<Props, State> {
     }
 }
 
+external val AnimatedView : FC<ViewProps>
+
 external class Animated : Component<Props, State> {
 
     class View : Component<ViewProps, State> {
@@ -330,3 +334,86 @@ external object AccessibilityInfo {
     fun addEventListener(eventName: String, handler: (args: dynamic) -> Unit): dynamic
     fun removeEventListener(eventName: String, handler: (args: dynamic) -> Unit)
 }
+
+external object Image {
+    fun getSize(uri: String, success: () -> Unit, failure: () -> Unit): dynamic
+    fun getSizeWithHeaders(uri: String, headers: dynamic, success: () -> Unit, failure: () -> Unit): dynamic
+    fun prefetch(uri: String): dynamic
+    fun abortPrefetch(requestId: Number): dynamic
+    fun queryCache(vararg urls: String): dynamic
+    fun resolveAssetSource(source: dynamic): dynamic
+}
+
+external object TextInput {
+    fun focus()
+    fun blur()
+    fun clear()
+    fun isFocused(): dynamic
+}
+
+external object FlatList {
+    fun scrollToEnd(params: dynamic)
+    fun scrollToIndex(params: dynamic)
+    fun scrollToItem(params: dynamic)
+    fun scrollToOffset(params: dynamic)
+    fun recordInteraction()
+    fun flashScrollIndicators()
+    fun getNativeScrollRef()
+    fun getScrollResponder()
+    fun getScrollableNode()
+}
+
+external object ScrollView {
+    fun flashScrollIndicators()
+    fun scrollTo(vararg options: dynamic)
+    fun scrollToEnd(vararg options: dynamic)
+    fun scrollWithoutAnimationTo(y: dynamic, x: dynamic)
+}
+
+external object SectionList {
+    fun scrollToLocation(params: dynamic)
+    fun recordInteraction()
+    fun flashScrollIndicators()
+}
+
+external object StatusBar {
+    fun popStackEntry(entry: dynamic): dynamic
+    fun pushStackEntry(entry: dynamic): dynamic
+    fun replaceStackEntry(entry: dynamic, props: dynamic): dynamic
+    fun setBackgroundColor(color: String, animated: Boolean)
+    fun setBarStyle(style: dynamic, animated: Boolean)
+    fun setHidden(hidden: Boolean, animation: dynamic)
+    fun setNetworkActivityIndicatorVisible(visible: Boolean)
+    fun setTranslucent(translucent: Boolean)
+}
+
+external object TouchableOpacity {
+    fun setOpacityTo(value: Number, duration: Number)
+}
+
+external object VirtualizedList {
+    fun scrollToEnd(params: dynamic)
+    fun scrollToIndex(params: dynamic)
+    fun scrollToItem(params: dynamic)
+    fun scrollToOffset(params: dynamic)
+    fun recordInteraction()
+    fun flashScrollIndicators()
+    fun getScrollRef()
+    fun getScrollResponder()
+    fun getScrollableNode()
+    fun setNativeProps(params: dynamic)
+    fun getChildContext() : dynamic
+    fun hasMore(): Boolean
+}
+
+external object DrawerLayoutAndroid {
+    fun closeDrawer()
+    fun openDrawer()
+}
+
+external object TouchableNativeFeedback {
+    fun SelectableBackground(rippleRadius: Number)
+    fun SelectableBackgroundBorderless(rippleRadius: Number)
+    fun Ripple(color: String, borderless: Boolean, rippleRadius: Number)
+    fun canUseNativeForeground()
+}