From 2fc1dcc3a1e493c3d8658052f9bfbf151cb2b344 Mon Sep 17 00:00:00 2001 From: Vladimir Date: Thu, 1 Oct 2020 18:30:15 +0300 Subject: [PATCH] move to another module --- README.md | 1 + .../views/widget/web_view/WebViewCallback.kt | 9 ---- views/src/main/res/values/attrs.xml | 10 ----- webview/.gitignore | 1 + webview/build.gradle | 44 +++++++++++++++++++ webview/src/main/AndroidManifest.xml | 2 + .../roboswag/webview}/web_view/BaseWebView.kt | 7 ++- .../webview}/web_view/BaseWebViewClient.kt | 2 +- .../webview}/web_view/CustomWebView.kt | 2 +- .../webview/web_view/WebViewCallback.kt | 7 +++ .../src/main/res/layout/base_web_view.xml | 3 +- webview/src/main/res/values/attrs.xml | 14 ++++++ webview/src/main/res/values/styles.xml | 3 ++ 13 files changed, 78 insertions(+), 27 deletions(-) delete mode 100644 views/src/main/java/ru/touchin/roboswag/views/widget/web_view/WebViewCallback.kt create mode 100644 webview/.gitignore create mode 100644 webview/build.gradle create mode 100644 webview/src/main/AndroidManifest.xml rename {views/src/main/java/ru/touchin/roboswag/views/widget => webview/src/main/java/ru/touchin/roboswag/webview}/web_view/BaseWebView.kt (95%) rename {views/src/main/java/ru/touchin/roboswag/views/widget => webview/src/main/java/ru/touchin/roboswag/webview}/web_view/BaseWebViewClient.kt (97%) rename {views/src/main/java/ru/touchin/roboswag/views/widget => webview/src/main/java/ru/touchin/roboswag/webview}/web_view/CustomWebView.kt (94%) create mode 100644 webview/src/main/java/ru/touchin/roboswag/webview/web_view/WebViewCallback.kt rename {views => webview}/src/main/res/layout/base_web_view.xml (94%) create mode 100644 webview/src/main/res/values/attrs.xml create mode 100644 webview/src/main/res/values/styles.xml diff --git a/README.md b/README.md index f48dec0..d1f42a6 100644 --- a/README.md +++ b/README.md @@ -63,6 +63,7 @@ gradle.ext.roboswag = [ 'base-map', 'yandex-map', 'google-map', + 'webview', 'encrypted-shared-prefs' ] diff --git a/views/src/main/java/ru/touchin/roboswag/views/widget/web_view/WebViewCallback.kt b/views/src/main/java/ru/touchin/roboswag/views/widget/web_view/WebViewCallback.kt deleted file mode 100644 index 1e26e8d..0000000 --- a/views/src/main/java/ru/touchin/roboswag/views/widget/web_view/WebViewCallback.kt +++ /dev/null @@ -1,9 +0,0 @@ -package ru.touchin.roboswag.views.widget.web_view - -import ru.touchin.roboswag.views.widget.web_view.WebViewLoadingState - -interface WebViewCallback { - - fun onStateChanged(newState: WebViewLoadingState) - -} \ No newline at end of file diff --git a/views/src/main/res/values/attrs.xml b/views/src/main/res/values/attrs.xml index ccd6736..bf3eacc 100644 --- a/views/src/main/res/values/attrs.xml +++ b/views/src/main/res/values/attrs.xml @@ -34,14 +34,4 @@ - - - - - - - - - - diff --git a/webview/.gitignore b/webview/.gitignore new file mode 100644 index 0000000..796b96d --- /dev/null +++ b/webview/.gitignore @@ -0,0 +1 @@ +/build diff --git a/webview/build.gradle b/webview/build.gradle new file mode 100644 index 0000000..5b4bd46 --- /dev/null +++ b/webview/build.gradle @@ -0,0 +1,44 @@ +apply from: "../android-configs/lib-config.gradle" +apply plugin: 'kotlin-android' + +android { + buildFeatures { + viewBinding true + } +} + +dependencies { + implementation project(":views") + implementation project(":kotlin-extensions") + + implementation "com.google.android.material:material" + implementation "androidx.constraintlayout:constraintlayout" + implementation "androidx.core:core-ktx" + + constraints { + implementation("com.google.android.material:material") { + version { + require '1.0.0' + } + } + implementation("androidx.constraintlayout:constraintlayout") { + version { + require '2.0.0-beta4' + } + } + implementation("androidx.core:core-ktx") { + version { + require '1.3.1' + } + } + implementation("org.jetbrains.kotlin:kotlin-stdlib") { + version { + require '1.3.0' + } + } + } +} + +repositories { + mavenCentral() +} diff --git a/webview/src/main/AndroidManifest.xml b/webview/src/main/AndroidManifest.xml new file mode 100644 index 0000000..9157adb --- /dev/null +++ b/webview/src/main/AndroidManifest.xml @@ -0,0 +1,2 @@ + diff --git a/views/src/main/java/ru/touchin/roboswag/views/widget/web_view/BaseWebView.kt b/webview/src/main/java/ru/touchin/roboswag/webview/web_view/BaseWebView.kt similarity index 95% rename from views/src/main/java/ru/touchin/roboswag/views/widget/web_view/BaseWebView.kt rename to webview/src/main/java/ru/touchin/roboswag/webview/web_view/BaseWebView.kt index 4954ed8..404bf15 100644 --- a/views/src/main/java/ru/touchin/roboswag/views/widget/web_view/BaseWebView.kt +++ b/webview/src/main/java/ru/touchin/roboswag/webview/web_view/BaseWebView.kt @@ -1,4 +1,4 @@ -package ru.touchin.roboswag.views.widget.web_view +package ru.touchin.roboswag.webview.web_view import android.annotation.SuppressLint import android.content.Context @@ -11,10 +11,9 @@ import android.webkit.WebView import androidx.core.content.withStyledAttributes import androidx.core.widget.TextViewCompat import ru.touchin.extensions.setOnRippleClickListener -import ru.touchin.roboswag.components.utils.UiUtils -import ru.touchin.roboswag.views.R -import ru.touchin.roboswag.views.databinding.BaseWebViewBinding import ru.touchin.roboswag.views.widget.Switcher +import ru.touchin.roboswag.webview.R +import ru.touchin.roboswag.webview.databinding.BaseWebViewBinding open class BaseWebView @JvmOverloads constructor( context: Context, diff --git a/views/src/main/java/ru/touchin/roboswag/views/widget/web_view/BaseWebViewClient.kt b/webview/src/main/java/ru/touchin/roboswag/webview/web_view/BaseWebViewClient.kt similarity index 97% rename from views/src/main/java/ru/touchin/roboswag/views/widget/web_view/BaseWebViewClient.kt rename to webview/src/main/java/ru/touchin/roboswag/webview/web_view/BaseWebViewClient.kt index e73c2d9..38546d3 100644 --- a/views/src/main/java/ru/touchin/roboswag/views/widget/web_view/BaseWebViewClient.kt +++ b/webview/src/main/java/ru/touchin/roboswag/webview/web_view/BaseWebViewClient.kt @@ -1,4 +1,4 @@ -package ru.touchin.roboswag.views.widget.web_view +package ru.touchin.roboswag.webview.web_view import android.graphics.Bitmap import android.net.http.SslError diff --git a/views/src/main/java/ru/touchin/roboswag/views/widget/web_view/CustomWebView.kt b/webview/src/main/java/ru/touchin/roboswag/webview/web_view/CustomWebView.kt similarity index 94% rename from views/src/main/java/ru/touchin/roboswag/views/widget/web_view/CustomWebView.kt rename to webview/src/main/java/ru/touchin/roboswag/webview/web_view/CustomWebView.kt index cbb1bfb..72a4a4e 100644 --- a/views/src/main/java/ru/touchin/roboswag/views/widget/web_view/CustomWebView.kt +++ b/webview/src/main/java/ru/touchin/roboswag/webview/web_view/CustomWebView.kt @@ -1,4 +1,4 @@ -package ru.touchin.roboswag.views.widget.web_view +package ru.touchin.roboswag.webview.web_view import android.content.Context import android.util.AttributeSet diff --git a/webview/src/main/java/ru/touchin/roboswag/webview/web_view/WebViewCallback.kt b/webview/src/main/java/ru/touchin/roboswag/webview/web_view/WebViewCallback.kt new file mode 100644 index 0000000..d12e5bf --- /dev/null +++ b/webview/src/main/java/ru/touchin/roboswag/webview/web_view/WebViewCallback.kt @@ -0,0 +1,7 @@ +package ru.touchin.roboswag.webview.web_view + +interface WebViewCallback { + + fun onStateChanged(newState: WebViewLoadingState) + +} \ No newline at end of file diff --git a/views/src/main/res/layout/base_web_view.xml b/webview/src/main/res/layout/base_web_view.xml similarity index 94% rename from views/src/main/res/layout/base_web_view.xml rename to webview/src/main/res/layout/base_web_view.xml index 30e21fc..0576588 100644 --- a/views/src/main/res/layout/base_web_view.xml +++ b/webview/src/main/res/layout/base_web_view.xml @@ -4,7 +4,7 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - + + + + + + + + + + + + + diff --git a/webview/src/main/res/values/styles.xml b/webview/src/main/res/values/styles.xml new file mode 100644 index 0000000..045e125 --- /dev/null +++ b/webview/src/main/res/values/styles.xml @@ -0,0 +1,3 @@ + + +