Merge branch 'master' into dependabot/gradle/androidx.navigation.safeargs.kotlin-2.9.4

Author: DenBond7

FlowCrypt/build.gradle.kts

@@ -436,7 +436,7 @@ dependencies {
   androidTestImplementation("androidx.test.uiautomator:uiautomator:2.3.0")
   androidTestImplementation("androidx.room:room-testing:2.7.2")
   androidTestImplementation("androidx.arch.core:core-testing:2.2.0")
-  androidTestImplementation("androidx.work:work-testing:2.10.3")
+  androidTestImplementation("androidx.work:work-testing:2.10.4")
   androidTestImplementation("com.squareup.okhttp3:mockwebserver:5.1.0")
   androidTestImplementation("com.squareup.okhttp3:okhttp-tls:5.1.0")
   androidTestImplementation("com.athaydes.rawhttp:rawhttp-core:2.6.0")
@@ -477,17 +477,17 @@ dependencies {
   implementation("androidx.preference:preference-ktx:1.2.1")
   implementation("androidx.core:core-ktx:1.17.0")
   implementation("androidx.core:core-splashscreen:1.0.1")
-  implementation("androidx.activity:activity-ktx:1.10.1")
+  implementation("androidx.activity:activity-ktx:1.11.0")
   implementation("androidx.fragment:fragment-ktx:1.8.9")
-  implementation("androidx.work:work-runtime-ktx:2.10.3")
+  implementation("androidx.work:work-runtime-ktx:2.10.4")
   implementation("androidx.navigation:navigation-fragment-ktx:2.9.3")
   implementation("androidx.navigation:navigation-ui-ktx:2.9.3")
   implementation("androidx.navigation:navigation-runtime-ktx:2.9.3")
   implementation("androidx.webkit:webkit:1.14.0")
 
   implementation("com.google.android.gms:play-services-base:18.7.2")
   implementation("com.google.android.gms:play-services-auth:21.4.0")
-  implementation("com.google.android.material:material:1.12.0")
+  implementation("com.google.android.material:material:1.13.0")
   implementation("com.google.android.flexbox:flexbox:3.0.0")
   implementation("com.google.code.gson:gson:2.13.1")
   implementation("com.google.api-client:google-api-client-android:2.8.1")

FlowCrypt/src/androidTest/java/com/flowcrypt/email/base/BaseTest.kt

@@ -403,6 +403,12 @@ abstract class BaseTest : BaseActivityTestImplementation {
     }
   }
 
+  protected fun getIdentifierByName(name: String): Int {
+    return getTargetContext()
+      .resources
+      .getIdentifier(name, "id", getTargetContext().packageName)
+  }
+
   companion object{
     const val NOTIFICATION_RESOURCES_NAME =
       "com.android.systemui:id/expandableNotificationRow"

FlowCrypt/src/androidTest/java/com/flowcrypt/email/matchers/AppBarLayoutBackgroundColorMatcher.kt

@@ -1,14 +1,14 @@
 /*
  * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
- * Contributors: DenBond7
+ * Contributors: denbond7
  */
 
 package com.flowcrypt.email.matchers
 
-import android.graphics.drawable.ColorDrawable
 import android.view.View
 import androidx.test.espresso.matcher.BoundedMatcher
 import com.google.android.material.appbar.AppBarLayout
+import com.google.android.material.shape.MaterialShapeDrawable
 import org.hamcrest.Description
 
 /**
@@ -17,9 +17,11 @@ import org.hamcrest.Description
 class AppBarLayoutBackgroundColorMatcher(val color: Int) :
   BoundedMatcher<View, AppBarLayout>(AppBarLayout::class.java) {
   public override fun matchesSafely(appBarLayout: AppBarLayout): Boolean {
-    return if (appBarLayout.background is ColorDrawable) {
-      color == (appBarLayout.background as ColorDrawable).color
-    } else false
+    return if (appBarLayout.background is MaterialShapeDrawable) {
+      (appBarLayout.background as MaterialShapeDrawable).fillColor?.defaultColor == color
+    } else {
+      false
+    }
   }
 
   override fun describeTo(description: Description) {

FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/RecipientsListFlowTest.kt

@@ -129,7 +129,7 @@ class RecipientsListFlowTest : BaseRecipientsListTest() {
     onView(withId(R.id.menuSearch))
       .check(matches(isDisplayed()))
       .perform(click())
-    onView(withId(com.google.android.material.R.id.search_src_text))
+    onView(withId(getIdentifierByName("search_src_text")))
       .perform(clearText(), replaceText("00"))
       .perform(pressKey(KeyEvent.KEYCODE_ENTER))
     closeSoftKeyboard()

FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/SelectRecipientsFragmentFlowTest.kt

@@ -1,6 +1,6 @@
 /*
  * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
- * Contributors: DenBond7
+ * Contributors: denbond7
  */
 
 package com.flowcrypt.email.ui
@@ -115,15 +115,15 @@ class SelectRecipientsFragmentFlowTest : BaseTest() {
     onView(withId(R.id.menuSearch))
       .check(matches(isDisplayed()))
       .perform(click())
-    onView(withId(com.google.android.material.R.id.search_src_text))
+    onView(withId(getIdentifierByName("search_src_text")))
       .perform(clearText(), typeText("some email"))
     closeSoftKeyboard()
     onView(withId(R.id.tVEmpty))
       .check(matches(isDisplayed())).check(matches(withText(R.string.no_results)))
   }
 
   private fun checkIsTypedUserFound(viewId: Int, viewText: String) {
-    onView(withId(com.google.android.material.R.id.search_src_text))
+    onView(withId(getIdentifierByName("search_src_text")))
       .perform(clearText(), typeText(viewText))
     closeSoftKeyboard()
     onView(withId(viewId))

FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/gmailapi/SearchMessagesGmailApiFlowTest.kt

@@ -97,7 +97,7 @@ class SearchMessagesGmailApiFlowTest : BaseGmailApiTest() {
     onView(withId(R.id.menuSearch))
       .check(matches(isDisplayed()))
       .perform(click())
-    onView(withId(com.google.android.material.R.id.search_src_text))
+    onView(withId(getIdentifierByName("search_src_text")))
       .perform(click(), clearText(), replaceText(SUBJECT_EXISTING_STANDARD))
       .perform(pressKey(KeyEvent.KEYCODE_ENTER))
 
@@ -114,4 +114,4 @@ class SearchMessagesGmailApiFlowTest : BaseGmailApiTest() {
         )
       )
   }
-}
+}