Skip to content

Commit

Permalink
1.0.3 publish
Browse files Browse the repository at this point in the history
  • Loading branch information
Kyun-J committed Jan 23, 2022
1 parent aef1b89 commit dd6b5ad
Show file tree
Hide file tree
Showing 24 changed files with 5,309 additions and 4,360 deletions.
16 changes: 0 additions & 16 deletions .idea/codeStyles/Project.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions .idea/deploymentTargetDropDown.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
ext.kotlin_version = '1.6.0'
ext.kotlin_version = '1.6.10'
repositories {
google()
mavenCentral()
Expand Down
10 changes: 5 additions & 5 deletions demo/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@ apply plugin: 'com.android.application'
apply plugin: 'kotlin-android'

android {
compileSdkVersion 31
buildToolsVersion "31.0.0"
compileSdkVersion 32
buildToolsVersion "32.0.0"

defaultConfig {
applicationId "app.dvkyun.flexhybrid.demo"
minSdkVersion 23
targetSdkVersion 31
targetSdkVersion 32
versionCode 1
versionName "0.1"

Expand All @@ -28,9 +28,9 @@ dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1'
implementation 'androidx.appcompat:appcompat:1.4.0'
implementation 'androidx.appcompat:appcompat:1.4.1'
implementation 'androidx.core:core-ktx:1.7.0'
implementation 'androidx.constraintlayout:constraintlayout:2.1.2'
implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test.ext:junit:1.1.3'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
package app.dvkyun.flexhybridand.demo;

import android.util.Log;

import java.util.HashMap;

import app.dvkyun.flexhybridand.FlexData;
import app.dvkyun.flexhybridand.FlexInterfaces;
import app.dvkyun.flexhybridand.forjava.InvokeFlex;
Expand Down
13 changes: 7 additions & 6 deletions demo/src/main/java/app/dvkyun/flexhybridand/demo/MainActivity.kt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import app.dvkyun.flexhybridand.demo.model.ActionDataTest
import java.util.HashMap

class MainActivity : AppCompatActivity() {

private var flexWebView: FlexWebView? = null

private val test4 = FlexLambda.action { action, _: FlexArguments ->
Expand Down Expand Up @@ -39,7 +39,7 @@ class MainActivity : AppCompatActivity() {
)
}
}

override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_main)
Expand Down Expand Up @@ -68,14 +68,15 @@ class MainActivity : AppCompatActivity() {
flexWebView?.setAction("test4", action = test4)
flexWebView?.setInterface("test5", lambda = test5)

// flexWebView?.setBaseUrl("file:///android_asset")
// flexWebView?.setAllowUrl(".google.com", true)
flexWebView?.setAllowUrl(".google.com", true)
flexWebView?.setAllowUrl(".*facebook.com", false)

// flexWebView?.baseUrl = "file:///android_asset"
// flexWebView?.setAllowFileAccessAndUrlAccessInFile(true)
// flexWebView?.loadUrl("file:///android_asset/html/test.html")

flexWebView?.baseUrl = "appassets.androidplatform.net"
flexWebView?.setAssetsLoaderUse(true, "/assets/")
flexWebView?.setAllowUrl(".google.com", true)
flexWebView?.setAllowUrl(".*facebook.com", false)
flexWebView?.loadUrl("https://appassets.androidplatform.net/assets/html/test.html")
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ data class ActionDataTest(
val boolData: Boolean,
val arrayData: ArrayList<Int>,
val objectData: HashMap<String, Any?>
) :FlexType
) : FlexType
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ import app.dvkyun.flexhybridand.FlexType
data class DataTest1(
val data: ArrayList<DataTest3>,
val testLong: Long
): FlexType
) : FlexType
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ import app.dvkyun.flexhybridand.FlexType
data class DataTest2(
val data: ArrayList<DataTest3>,
val testLong: Long
): FlexType
) : FlexType
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ import app.dvkyun.flexhybridand.FlexType

data class DataTest3(
val test: String
): FlexType
) : FlexType
Loading

0 comments on commit dd6b5ad

Please sign in to comment.