Merge branch 'develop' into 'master'

[IT-282]: add layout id for better integration

See merge request frontend/android-sdk!38

Author: Егор Комаров

sdk/build.gradle

@@ -5,7 +5,7 @@ plugins {
 }
 
 group = 'com.github.ogon-ru'
-version = '1.0.7'
+version = '1.0.8'
 
 android {
     compileSdkVersion 31
@@ -14,8 +14,8 @@ android {
     defaultConfig {
         minSdkVersion 19
         targetSdkVersion 31
-        versionCode 29
-        versionName '1.0.7'
+        versionCode 30
+        versionName '1.0.8'
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 

sdk/src/main/java/ru/ogon/sdk/WidgetActivity.kt

@@ -64,7 +64,7 @@ open class WidgetActivity : AppCompatActivity() {
         httpUsername = intent.getStringExtra(EXTRA_HTTP_USERNAME)
         httpPassword = intent.getStringExtra(EXTRA_HTTP_PASSWORD)
 
-        webView = findViewById<WebView>(R.id.webView).apply {
+        webView = findViewById<WebView>(R.id.web_view).apply {
             settings.javaScriptEnabled = true
             settings.allowContentAccess = true
             settings.allowFileAccess = true

sdk/src/main/res/layout/activity_widget.xml

@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/container"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:layout_alignParentBottom="true"
     android:fitsSystemWindows="true">
 
     <WebView
-        android:id="@+id/webView"
+        android:id="@+id/web_view"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
 </FrameLayout>