MPL Changes

yellowmessenger · Jun 24, 2020 · 0ef72b3 · 0ef72b3
1 parent c1ae41e
commit 0ef72b3
Show file tree

Hide file tree

Showing 18 changed files with 133 additions and 142 deletions.
diff --git a/.gradle/5.4.1/executionHistory/executionHistory.bin b/.gradle/5.4.1/executionHistory/executionHistory.bin
diff --git a/.gradle/5.4.1/executionHistory/executionHistory.lock b/.gradle/5.4.1/executionHistory/executionHistory.lock
diff --git a/.gradle/5.4.1/fileHashes/fileHashes.bin b/.gradle/5.4.1/fileHashes/fileHashes.bin
diff --git a/.gradle/5.4.1/fileHashes/fileHashes.lock b/.gradle/5.4.1/fileHashes/fileHashes.lock
diff --git a/.gradle/5.4.1/fileHashes/resourceHashesCache.bin b/.gradle/5.4.1/fileHashes/resourceHashesCache.bin
diff --git a/.gradle/5.4.1/javaCompile/classAnalysis.bin b/.gradle/5.4.1/javaCompile/classAnalysis.bin
diff --git a/.gradle/5.4.1/javaCompile/jarAnalysis.bin b/.gradle/5.4.1/javaCompile/jarAnalysis.bin
diff --git a/.gradle/5.4.1/javaCompile/javaCompile.lock b/.gradle/5.4.1/javaCompile/javaCompile.lock
diff --git a/.gradle/5.4.1/javaCompile/taskHistory.bin b/.gradle/5.4.1/javaCompile/taskHistory.bin
diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
diff --git a/.idea/caches/gradle_models.ser b/.idea/caches/gradle_models.ser
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git 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
@@ -149,7 +149,5 @@
     <orderEntry type="library" name="Gradle: androidx.arch.core:core-runtime:2.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.constraintlayout:constraintlayout:1.1.3@aar" level="project" />
     <orderEntry type="module" module-name="ymwebview" />
-    <orderEntry type="module" module-name="ymwebview" />
-    <orderEntry type="module" module-name="ymwebview" />
   </component>
 </module>
diff --git 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
@@ -62,14 +62,14 @@
 
     <ImageButton
         android:id="@+id/backButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="16dp"
+        android:layout_height="16dp"
         android:layout_alignParentTop="true"
         android:layout_alignParentRight="true"
-        android:layout_marginTop="10dp"
-        android:layout_marginRight="10dp"
+        android:layout_marginTop="20dp"
+        android:layout_marginRight="16dp"
         android:background="@color/transparent"
-        android:padding="14dp"
+        android:padding="20dp"
         app:srcCompat="@drawable/ic_back_button" />
 
 </RelativeLayout>