Merge branch 'feature/ui_tests_snackbar_analytics' into 'develop'

LostImagin4tion · LostImagin4tion · commit adf4c757616a · 2022-11-29T18:35:17.000Z
Feature/ui tests snackbar analytics

See merge request 19111/androidodoo!14
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -6,6 +6,14 @@ plugins {
     id("io.gitlab.arturbosch.detekt") version Dependencies.Plugins.DETEKT_VERSION
 }
 
+buildscript {
+    dependencies {
+        Dependencies.Firebase.ALL_GRADLE_PLUGINS.forEach {
+            classpath(it)
+        }
+    }
+}
+
 tasks {
     val detektAll by registering(io.gitlab.arturbosch.detekt.Detekt::class) {
         parallel = true
diff --git a/buildSrc/src/main/kotlin/consts/Dependencies.kt b/buildSrc/src/main/kotlin/consts/Dependencies.kt
@@ -86,6 +86,15 @@ object Dependencies {
             val ALL_RXJAVA_DEPS = listOf(RX_JAVA)
         }
 
+        object UiTest {
+
+            // add to build.gradle with androidTestImplementation()
+            const val UI_TEST = "androidx.compose.ui:ui-test-junit4:$COMPOSE_VERSION"
+
+            // add to build.gradle with debugImplementation
+            const val UI_TEST_DEBUG = "androidx.compose.ui:ui-test-manifest:$COMPOSE_VERSION"
+        }
+
         val ALL_DEPS =
             Core.ALL_CORE_DEPS + Lifecycle.ALL_LIFECYCLE_DEPS + Foundation.ALL_FOUNDATION_DEPS +
                 RxJava.ALL_RXJAVA_DEPS + Navigation.ALL_NAVIGATION_DEPS
@@ -148,6 +157,24 @@ object Dependencies {
         val ALL_DEPS = listOf(CONSTRAINT_LAYOUT, CORE)
     }
 
+    object Firebase {
+        private const val GOOGLE_SERVICES_VERSION = "4.3.14"
+        private const val BOM_VERSION = "31.1.0"
+        private const val CRASHLYTICS_GRADLE_VERSION = "2.9.2"
+
+        const val GOOGLE_SERVICES_GRADLE_PLUGIN = "com.google.gms:google-services:$GOOGLE_SERVICES_VERSION"
+        const val FIREBASE_CRASHLYTICS_GRADLE_PLUGIN =
+            "com.google.firebase:firebase-crashlytics-gradle:$CRASHLYTICS_GRADLE_VERSION"
+
+        const val FIREBASE_BOM = "com.google.firebase:firebase-bom:$BOM_VERSION"
+        const val FIREBASE_ANALYTICS = "com.google.firebase:firebase-analytics-ktx"
+        const val FIREBASE_CRASHLYTICS = "com.google.firebase:firebase-crashlytics-ktx"
+
+        val ALL_GRADLE_PLUGINS = listOf(GOOGLE_SERVICES_GRADLE_PLUGIN, FIREBASE_CRASHLYTICS_GRADLE_PLUGIN)
+
+        val ALL_DEPS = listOf(FIREBASE_ANALYTICS, FIREBASE_CRASHLYTICS)
+    }
+
     object Plugins {
         const val DETEKT_VERSION = "1.22.0-RC1"
 
diff --git a/buildSrc/src/main/kotlin/conventions/module/conventions.module-app.gradle.kts b/buildSrc/src/main/kotlin/conventions/module/conventions.module-app.gradle.kts
@@ -2,7 +2,7 @@ import org.gradle.kotlin.dsl.dependencies
 import org.gradle.kotlin.dsl.kotlin
 
 /**
- * Конвеция для app модулей, которая содержит [conventions.base-api] и
+ * Конвеция для app модулей, которая содержит [conventions.base-app] и
  * добавляет необходимые зависимости
  *
  * @author Ворожцов Михаил
@@ -23,6 +23,10 @@ dependencies {
     implementation(Dependencies.Dagger.ANDROID)
     Dependencies.Dagger.KAPT_DEPS.forEach { kapt(it) }
 
+    // Firebase
+    Dependencies.Firebase.ALL_DEPS.forEach { implementation(it) }
+    implementation(platform(Dependencies.Firebase.FIREBASE_BOM))
+
     // Logger
     implementation(Dependencies.Logger.TIMBER)
 
diff --git a/buildSrc/src/main/kotlin/conventions/module_advanced/app/conventions.module-compose-app.gradle.kts b/buildSrc/src/main/kotlin/conventions/module_advanced/app/conventions.module-compose-app.gradle.kts
@@ -23,7 +23,7 @@ dependencies {
     // Android Core
     Dependencies.AndroidCore.ALL_DEPS.forEach { implementation(it) }
 
-    // // Compose
+    // Compose
     Dependencies.Compose.ALL_DEPS.forEach { implementation(it) }
     Dependencies.Compose.Core.ALL_CORE_DEBUG_DEPS.forEach { debugImplementation(it) }
 
diff --git a/buildSrc/src/main/kotlin/conventions/module_advanced/impl/conventions.module-compose-impl.gradle.kts b/buildSrc/src/main/kotlin/conventions/module_advanced/impl/conventions.module-compose-impl.gradle.kts
@@ -13,6 +13,10 @@ android {
         compose = true
     }
 
+    defaultConfig {
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+    }
+
     composeOptions {
         kotlinCompilerExtensionVersion = CompileVersions.COMPOSE_COMPILE_VERSION
     }
@@ -27,6 +31,10 @@ dependencies {
     Dependencies.Compose.ALL_DEPS.forEach { implementation(it) }
     Dependencies.Compose.Core.ALL_CORE_DEBUG_DEPS.forEach { debugImplementation(it) }
 
+    // Tests
+    androidTestImplementation(Dependencies.Compose.UiTest.UI_TEST)
+    debugImplementation(Dependencies.Compose.UiTest.UI_TEST_DEBUG)
+
     // UI
     Dependencies.UI.ALL_DEPS.forEach { implementation(it) }
 
diff --git a/common/uiKitComponents/src/androidTest/kotlin/odoo/miem/android/common/uiKitComponents/UiKitComponentsTest.kt b/common/uiKitComponents/src/androidTest/kotlin/odoo/miem/android/common/uiKitComponents/UiKitComponentsTest.kt
@@ -0,0 +1,78 @@
+package odoo.miem.android.common.uiKitComponents
+
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.saveable.rememberSaveable
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.semantics.contentDescription
+import androidx.compose.ui.semantics.semantics
+import androidx.compose.ui.test.assert
+import androidx.compose.ui.test.hasText
+import androidx.compose.ui.test.junit4.createComposeRule
+import androidx.compose.ui.test.onNodeWithContentDescription
+import androidx.compose.ui.test.onNodeWithText
+import androidx.compose.ui.test.performClick
+import androidx.compose.ui.test.performTextInput
+import androidx.compose.ui.text.input.TextFieldValue
+import androidx.test.platform.app.InstrumentationRegistry
+import odoo.miem.android.common.uiKitComponents.textfields.LoginTextField
+import odoo.miem.android.core.uiKitTheme.OdooMiemAndroidTheme
+import org.junit.Rule
+import org.junit.Test
+
+/**
+ * [UiKitComponentsTest] - UI tests for UI components from odoo.miem.android.common.uiKitComponents package
+ *
+ * Contains:
+ * [] - test for [LoginTextField]
+ *
+ * @author Egor Danilov
+ */
+class UiKitComponentsTest {
+    private val context by lazy { InstrumentationRegistry.getInstrumentation().context }
+
+    @get:Rule
+    val composeTestRule = createComposeRule()
+
+    @Test
+    fun testInputAndClearLoginTextField() {
+        val textFieldLabel = context.getString(R.string.test_text_field_desc)
+        val trailingIconDesc = context.getString(R.string.text_field_trailing_icon_desc)
+        val testInput = context.getString(R.string.test_input)
+
+        // Preparation
+        composeTestRule.setContent {
+            var textFieldInput by rememberSaveable(stateSaver = TextFieldValue.Saver) {
+                mutableStateOf(TextFieldValue())
+            }
+
+            OdooMiemAndroidTheme {
+                LoginTextField(
+                    value = textFieldInput,
+                    labelResource = R.string.test_text_field_desc,
+                    onValueChange = { textFieldInput = it },
+                )
+            }
+        }
+        val textFieldNode = composeTestRule.onNodeWithText(textFieldLabel)
+        val trailingIconNode = composeTestRule.onNodeWithContentDescription(trailingIconDesc)
+
+        // Asserting
+
+        // Checking if all ui elements are displayed
+        textFieldNode.assertExists()
+        trailingIconNode.assertDoesNotExist()
+        textFieldNode.assert(hasText(""))
+
+        textFieldNode.performTextInput(testInput)
+        textFieldNode.assert(hasText(testInput))
+
+        // Cleaning
+        trailingIconNode.assertExists()
+        trailingIconNode.performClick()
+        trailingIconNode.assertDoesNotExist()
+        textFieldNode.assert(hasText(""))
+    }
+}
diff --git a/common/uiKitComponents/src/main/kotlin/odoo/miem/android/common/uiKitComponents/buttons/TextButton.kt b/common/uiKitComponents/src/main/kotlin/odoo/miem/android/common/uiKitComponents/buttons/TextButton.kt
@@ -41,12 +41,12 @@ fun TextButton(
         colors = colors,
         modifier = modifier
     ) {
-        // I know, its stupid but I found some kind of bug
-        // If set end padding to Image and remove start padding from Text, icon become very small
         iconResource?.let {
             Icon(
                 painter = painterResource(iconResource),
-                contentDescription = null,
+                contentDescription = stringResource(
+                    odoo.miem.android.common.uiKitComponents.R.string.button_icon_desc
+                ),
                 modifier = Modifier.size(buttonIconSize)
             )
         }
diff --git a/common/uiKitComponents/src/main/kotlin/odoo/miem/android/common/uiKitComponents/textfields/LoginTextField.kt b/common/uiKitComponents/src/main/kotlin/odoo/miem/android/common/uiKitComponents/textfields/LoginTextField.kt
@@ -18,6 +18,8 @@ import androidx.compose.material3.OutlinedTextField
 import androidx.compose.material3.Text
 import androidx.compose.material3.TextFieldDefaults
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalFocusManager
 import androidx.compose.ui.res.painterResource
@@ -40,11 +42,12 @@ import odoo.miem.android.core.uiKitTheme.odooPrimaryGray
 @Composable
 fun LoginTextField(
     value: TextFieldValue,
+    onValueChange: (TextFieldValue) -> Unit = {},
     @StringRes labelResource: Int,
-    onValueChange: (TextFieldValue) -> Unit,
     visualTransformation: VisualTransformation = VisualTransformation.None,
     keyboardType: KeyboardType = KeyboardType.Text,
-    isError: Boolean = false,
+    imeAction: ImeAction = ImeAction.Done,
+    isError: Boolean = false
 ) {
     val focusManager = LocalFocusManager.current
     val textStyle = MaterialTheme.typography.bodyMedium
@@ -58,7 +61,7 @@ fun LoginTextField(
             IconButton(onClick = { onValueChange(TextFieldValue()) }) {
                 Icon(
                     painter = painterResource(R.drawable.ic_trailing_icon),
-                    contentDescription = null,
+                    contentDescription = stringResource(R.string.text_field_trailing_icon_desc),
                     modifier = Modifier.size(20.dp),
                     tint = odooPrimaryGray
                 )
@@ -73,7 +76,7 @@ fun LoginTextField(
         singleLine = true,
         label = { Text(text = stringResource(labelResource), style = textStyle) },
         visualTransformation = visualTransformation,
-        keyboardOptions = KeyboardOptions(keyboardType = keyboardType, imeAction = ImeAction.Done),
+        keyboardOptions = KeyboardOptions(keyboardType = keyboardType, imeAction = imeAction),
         keyboardActions = KeyboardActions(onDone = { focusManager.clearFocus() }),
         isError = isError,
         shape = MaterialTheme.shapes.small,
@@ -94,6 +97,6 @@ fun LoginTextField(
         modifier = Modifier
             .fillMaxWidth()
             .padding(horizontal = mainHorizontalPadding)
-            .padding(top = 30.dp),
+            .padding(top = 20.dp),
     )
 }
diff --git a/common/uiKitComponents/src/main/res/values/strings.xml b/common/uiKitComponents/src/main/res/values/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="text_field_trailing_icon_desc">textFieldTrailingIcon</string>
+    <string name="button_icon_desc">buttonIcon</string>
+
+    <!--  for ui tests  -->
+    <string name="test_text_field_desc">testTextField</string>
+    <string name="test_input">Test input</string>
+</resources>
diff --git a/core/uiKitTheme/src/main/kotlin/odoo/miem/android/core/uiKitTheme/OdooMiemAndroidTheme.kt b/core/uiKitTheme/src/main/kotlin/odoo/miem/android/core/uiKitTheme/OdooMiemAndroidTheme.kt
@@ -15,6 +15,8 @@ private val DarkColorPalette = darkColorScheme(
     onPrimaryContainer = Color.White,
     onSecondaryContainer = Color.White,
     surfaceVariant = odooPrimary.copy(alpha = 0.1f),
+    inverseSurface = Color.White,
+    inverseOnSurface = Color.Black,
     background = odooDarkBackground,
     surface = odooDarkBackground
 )
@@ -27,6 +29,8 @@ private val LightColorPalette = lightColorScheme(
     onPrimaryContainer = odooPrimaryGray,
     onSecondaryContainer = Color.Black,
     surfaceVariant = odooPrimary.copy(alpha = 0.1f),
+    inverseSurface = Color.White,
+    inverseOnSurface = Color.Black,
     background = odooLightGrayBackground,
     surface = odooLightGrayBackground
 )
diff --git a/entry/app/build.gradle.kts b/entry/app/build.gradle.kts
@@ -1,5 +1,7 @@
 plugins {
     conventions.`module-compose-app`
+    id("com.google.gms.google-services")
+    id("com.google.firebase.crashlytics")
 }
 
 dependencies {
diff --git a/entry/app/google-services.json b/entry/app/google-services.json
@@ -0,0 +1,39 @@
+{
+  "project_info": {
+    "project_number": "231122362032",
+    "project_id": "odoomobile-c6b73",
+    "storage_bucket": "odoomobile-c6b73.appspot.com"
+  },
+  "client": [
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:231122362032:android:d0ba6301fbb3f7763f2575",
+        "android_client_info": {
+          "package_name": "odoo.miem.android"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "231122362032-1065g6tuk3ej3g555tfhlrt9mnrg9oeo.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyCkEPNxYMk_DvP0v5WvLd0cgL0HbIK-R14"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": [
+            {
+              "client_id": "231122362032-1065g6tuk3ej3g555tfhlrt9mnrg9oeo.apps.googleusercontent.com",
+              "client_type": 3
+            }
+          ]
+        }
+      }
+    }
+  ],
+  "configuration_version": "1"
+}
diff --git a/feature/authorization/base/impl/build.gradle.kts b/feature/authorization/base/impl/build.gradle.kts
@@ -7,6 +7,8 @@ dependencies {
     Dependencies.RxJava.ALL_DEPS.forEach { implementation(it) }
 
     // Common
+    // Components
+    implementation(project(":common:uiKitComponents"))
     // Network - authorization
     api(project(":common:network:authorization:api"))
 
diff --git a/feature/authorization/base/impl/src/androidTest/kotlin/odoo/miem/android/feature/authorization/base/impl/AuthorizationScreenUITest.kt b/feature/authorization/base/impl/src/androidTest/kotlin/odoo/miem/android/feature/authorization/base/impl/AuthorizationScreenUITest.kt
diff --git a/feature/authorization/base/impl/src/main/kotlin/odoo/miem/android/feature/authorization/base/impl/AuthorizationScreen.kt b/feature/authorization/base/impl/src/main/kotlin/odoo/miem/android/feature/authorization/base/impl/AuthorizationScreen.kt
diff --git a/feature/authorization/base/impl/src/main/res/values-ru-rRU/strings.xml b/feature/authorization/base/impl/src/main/res/values-ru-rRU/strings.xml
diff --git a/feature/authorization/base/impl/src/main/res/values/strings.xml b/feature/authorization/base/impl/src/main/res/values/strings.xml
diff --git a/feature/navigation/src/main/kotlin/odoo/miem/android/feature/navigation/MainActivity.kt b/feature/navigation/src/main/kotlin/odoo/miem/android/feature/navigation/MainActivity.kt
diff --git a/feature/navigation/src/main/kotlin/odoo/miem/android/feature/navigation/ui/Navigation.kt b/feature/navigation/src/main/kotlin/odoo/miem/android/feature/navigation/ui/Navigation.kt
