From ccb3f1c4e1d6e2060d1663f294e892cf3f8ff2bc Mon Sep 17 00:00:00 2001
From: Rinat Nurmukhametov <rinat.nur.93@mail.ru>
Date: Wed, 16 Mar 2022 18:31:01 +0300
Subject: [PATCH] create services module

---
 client-services/.gitignore                    |  1 +
 client-services/build.gradle                  | 35 +++++++++++++++++++
 client-services/src/main/AndroidManifest.xml  |  6 ++++
 .../touchin/client_services/MobileService.kt  |  5 +++
 .../touchin/client_services}/ServicesUtils.kt |  7 +---
 recaptcha/build.gradle                        |  3 +-
 .../ru/touchin/recaptcha/CaptchaManager.kt    |  2 ++
 7 files changed, 52 insertions(+), 7 deletions(-)
 create mode 100644 client-services/.gitignore
 create mode 100644 client-services/build.gradle
 create mode 100644 client-services/src/main/AndroidManifest.xml
 create mode 100644 client-services/src/main/java/ru/touchin/client_services/MobileService.kt
 rename {recaptcha/src/main/java/ru/touchin/recaptcha => client-services/src/main/java/ru/touchin/client_services}/ServicesUtils.kt (85%)

diff --git a/client-services/.gitignore b/client-services/.gitignore
new file mode 100644
index 0000000..42afabf
--- /dev/null
+++ b/client-services/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/client-services/build.gradle b/client-services/build.gradle
new file mode 100644
index 0000000..c55e87e
--- /dev/null
+++ b/client-services/build.gradle
@@ -0,0 +1,35 @@
+apply from: "../android-configs/lib-config.gradle"
+apply plugin: 'com.huawei.agconnect'
+
+dependencies {
+    implementation "androidx.core:core"
+    implementation "androidx.annotation:annotation"
+    implementation "com.google.android.gms:play-services-base"
+    implementation "com.huawei.hms:safetydetect"
+
+    constraints {
+        implementation("androidx.core:core") {
+            version {
+                require '1.0.0'
+            }
+        }
+
+        implementation("androidx.annotation:annotation") {
+            version {
+                require '1.1.0'
+            }
+        }
+
+        implementation("com.google.android.gms:play-services-base") {
+            version {
+                require '18.0.1'
+            }
+        }
+
+        implementation("com.huawei.hms:safetydetect") {
+            version {
+                require '4.0.3.300'
+            }
+        }
+    }
+}
diff --git a/client-services/src/main/AndroidManifest.xml b/client-services/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..4390a88
--- /dev/null
+++ b/client-services/src/main/AndroidManifest.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    package="ru.touchin.client_services">
+
+</manifest>
\ No newline at end of file
diff --git a/client-services/src/main/java/ru/touchin/client_services/MobileService.kt b/client-services/src/main/java/ru/touchin/client_services/MobileService.kt
new file mode 100644
index 0000000..6514e3a
--- /dev/null
+++ b/client-services/src/main/java/ru/touchin/client_services/MobileService.kt
@@ -0,0 +1,5 @@
+package ru.touchin.client_services
+
+enum class MobileService {
+    HUAWEI_SERVICE, GOOGLE_SERVICE
+}
diff --git a/recaptcha/src/main/java/ru/touchin/recaptcha/ServicesUtils.kt b/client-services/src/main/java/ru/touchin/client_services/ServicesUtils.kt
similarity index 85%
rename from recaptcha/src/main/java/ru/touchin/recaptcha/ServicesUtils.kt
rename to client-services/src/main/java/ru/touchin/client_services/ServicesUtils.kt
index e2c24e1..a4566d9 100644
--- a/recaptcha/src/main/java/ru/touchin/recaptcha/ServicesUtils.kt
+++ b/client-services/src/main/java/ru/touchin/client_services/ServicesUtils.kt
@@ -1,11 +1,10 @@
-package ru.touchin.recaptcha
+package ru.touchin.client_services
 
 import android.content.Context
 import com.google.android.gms.common.ConnectionResult
 import com.google.android.gms.common.GoogleApiAvailability
 import com.huawei.hms.api.HuaweiApiAvailability
 
-//TODO: in the future move to a module with services
 class ServicesUtils {
 
     fun getCurrentService(context: Context): MobileService = when {
@@ -23,7 +22,3 @@ class ServicesUtils {
                     .isGooglePlayServicesAvailable(context) == ConnectionResult.SUCCESS
 
 }
-
-enum class MobileService {
-    HUAWEI_SERVICE, GOOGLE_SERVICE
-}
diff --git a/recaptcha/build.gradle b/recaptcha/build.gradle
index 7f748b6..51b4418 100644
--- a/recaptcha/build.gradle
+++ b/recaptcha/build.gradle
@@ -2,7 +2,8 @@ apply from: "../android-configs/lib-config.gradle"
 apply plugin: 'com.huawei.agconnect'
 
 dependencies {
-    implementation project(':kotlin-extensions')
+    implementation project(':client-services')
+
     implementation "androidx.core:core"
     implementation "androidx.annotation:annotation"
     implementation "com.google.android.gms:play-services-safetynet"
diff --git a/recaptcha/src/main/java/ru/touchin/recaptcha/CaptchaManager.kt b/recaptcha/src/main/java/ru/touchin/recaptcha/CaptchaManager.kt
index ebf7744..2fd00ee 100644
--- a/recaptcha/src/main/java/ru/touchin/recaptcha/CaptchaManager.kt
+++ b/recaptcha/src/main/java/ru/touchin/recaptcha/CaptchaManager.kt
@@ -1,6 +1,8 @@
 package ru.touchin.recaptcha
 
 import android.app.Activity
+import ru.touchin.client_services.MobileService
+import ru.touchin.client_services.ServicesUtils
 
 /**
  * onNewTokenReceived - callback на успешную проверку каптчи