diff --git a/.gradle/5.4.1/executionHistory/executionHistory.bin b/.gradle/5.4.1/executionHistory/executionHistory.bin index ac2e8a7..6ce7187 100644 Binary files a/.gradle/5.4.1/executionHistory/executionHistory.bin and b/.gradle/5.4.1/executionHistory/executionHistory.bin differ diff --git a/.gradle/5.4.1/executionHistory/executionHistory.lock b/.gradle/5.4.1/executionHistory/executionHistory.lock index 2a5ffb9..3377088 100644 Binary files a/.gradle/5.4.1/executionHistory/executionHistory.lock and b/.gradle/5.4.1/executionHistory/executionHistory.lock differ diff --git a/.gradle/5.4.1/fileHashes/fileHashes.bin b/.gradle/5.4.1/fileHashes/fileHashes.bin index cbb9698..4ed596f 100644 Binary files a/.gradle/5.4.1/fileHashes/fileHashes.bin and b/.gradle/5.4.1/fileHashes/fileHashes.bin differ diff --git a/.gradle/5.4.1/fileHashes/fileHashes.lock b/.gradle/5.4.1/fileHashes/fileHashes.lock index 5293098..c9b5c7e 100644 Binary files a/.gradle/5.4.1/fileHashes/fileHashes.lock and b/.gradle/5.4.1/fileHashes/fileHashes.lock differ diff --git a/.gradle/5.4.1/fileHashes/resourceHashesCache.bin b/.gradle/5.4.1/fileHashes/resourceHashesCache.bin index 9074637..d24bb85 100644 Binary files a/.gradle/5.4.1/fileHashes/resourceHashesCache.bin and b/.gradle/5.4.1/fileHashes/resourceHashesCache.bin differ diff --git a/.gradle/5.4.1/javaCompile/classAnalysis.bin b/.gradle/5.4.1/javaCompile/classAnalysis.bin index 851966c..42dd3b3 100644 Binary files a/.gradle/5.4.1/javaCompile/classAnalysis.bin and b/.gradle/5.4.1/javaCompile/classAnalysis.bin differ diff --git a/.gradle/5.4.1/javaCompile/jarAnalysis.bin b/.gradle/5.4.1/javaCompile/jarAnalysis.bin index 9c73dda..2172341 100644 Binary files a/.gradle/5.4.1/javaCompile/jarAnalysis.bin and b/.gradle/5.4.1/javaCompile/jarAnalysis.bin differ diff --git a/.gradle/5.4.1/javaCompile/javaCompile.lock b/.gradle/5.4.1/javaCompile/javaCompile.lock index ad7e141..97945c4 100644 Binary files a/.gradle/5.4.1/javaCompile/javaCompile.lock and b/.gradle/5.4.1/javaCompile/javaCompile.lock differ diff --git a/.gradle/5.4.1/javaCompile/taskHistory.bin b/.gradle/5.4.1/javaCompile/taskHistory.bin index 6c675b8..a6b25f3 100644 Binary files a/.gradle/5.4.1/javaCompile/taskHistory.bin and b/.gradle/5.4.1/javaCompile/taskHistory.bin differ diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock index 2f5a7fa..522b61a 100644 Binary files a/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index 01d9f3a..c930be0 100644 Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ diff --git a/.idea/caches/gradle_models.ser b/.idea/caches/gradle_models.ser index 14e8ace..6d511d5 100644 Binary files a/.idea/caches/gradle_models.ser and b/.idea/caches/gradle_models.ser differ diff --git a/.idea/misc.xml b/.idea/misc.xml index 7bfef59..b6ea2b1 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,6 +1,6 @@ - + diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 4b51ec3..e483526 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -15,16 +15,13 @@ - + + + + - - - - - - - + - - - - - - - - - - - - - - @@ -72,20 +55,20 @@ - - + + - + - - + + @@ -100,8 +83,8 @@ - - + + @@ -117,20 +100,41 @@ - - + - + + - + - + + + + + + + + + + + + + + + + + + + + + + - - + + @@ -171,17 +175,17 @@ @@ -192,10 +196,12 @@ - + + + @@ -228,45 +234,34 @@ - - - - @@ -275,13 +270,15 @@ + + - + @@ -389,11 +386,11 @@ - + - + @@ -401,7 +398,7 @@ - + @@ -409,7 +406,7 @@ - + @@ -479,13 +476,6 @@ - - - - - - - @@ -500,13 +490,6 @@ - - - - - - - @@ -538,30 +521,21 @@ - - - - - - - - - - - - - - - - - + + + + + + + + @@ -573,17 +547,17 @@ - + - - + + - + - - + + @@ -594,43 +568,60 @@ - - + - - + + - - + - - + + + - + - - + + - + + + + + + + + + - - + + - - + - - + + + + + + + + + + + + + \ No newline at end of file diff --git a/README.md b/README.md index 069d883..2eaa16d 100755 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ allprojects { dependencies { ... ... - implementation 'com.github.yellowmessenger:webviewsdk:0.1.3' + implementation 'com.github.yellowmessenger:webviewsdk:0.1.4' } diff --git a/app/app.iml b/app/app.iml index 8e39540..4db6508 100755 --- a/app/app.iml +++ b/app/app.iml @@ -149,7 +149,5 @@ - - \ No newline at end of file diff --git a/ymwebview/src/main/java/com/example/ymwebview/BotWebView.java b/ymwebview/src/main/java/com/example/ymwebview/BotWebView.java index e5a7812..d0d8174 100755 --- a/ymwebview/src/main/java/com/example/ymwebview/BotWebView.java +++ b/ymwebview/src/main/java/com/example/ymwebview/BotWebView.java @@ -22,6 +22,7 @@ import androidx.appcompat.app.AppCompatActivity; import androidx.fragment.app.FragmentManager; +import com.example.ymwebview.models.BotEventsModel; import com.example.ymwebview.models.ConfigDataModel; import com.google.android.material.floatingactionbutton.FloatingActionButton; @@ -56,6 +57,7 @@ public void onCreate(Bundle savedInstanceState) { ImageButton backButton = findViewById(R.id.backButton); backButton.setOnClickListener(view->{ + YMBotPlugin.getInstance().emitEvent(new BotEventsModel("bot-closed","")); this.finish(); }); } diff --git a/ymwebview/src/main/res/layout/activity_bot_web_view.xml b/ymwebview/src/main/res/layout/activity_bot_web_view.xml index 6e397da..ed53f04 100755 --- a/ymwebview/src/main/res/layout/activity_bot_web_view.xml +++ b/ymwebview/src/main/res/layout/activity_bot_web_view.xml @@ -62,14 +62,14 @@ \ No newline at end of file