fixing lint

duckduckgo · Feb 4, 2025 · 12bf984 · 12bf984
1 parent fc50c76
commit 12bf984
Show file tree

Hide file tree

Showing 4 changed files with 72 additions and 9 deletions.
diff --git a/autofill/autofill-impl/lint-baseline.xml b/autofill/autofill-impl/lint-baseline.xml
@@ -2025,6 +2025,17 @@
             column="25"/>
     </issue>
 
+    <issue
+        id="Overdraw"
+        message="Possible overdraw: Root element paints background `@color/gray0` with a theme that also paints a background (inferred theme is `@android:style/Theme.Holo`)"
+        errorLine1="    android:background=&quot;@color/gray0&quot;>"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/res/layout/autofill_remote_view.xml"
+            line="11"
+            column="5"/>
+    </issue>
+
     <issue
         id="Overdraw"
         message="Possible overdraw: Root element paints background `?attr/colorPrimaryDark` with a theme that also paints a background (inferred theme is `@android:style/Theme.Holo`)"
@@ -2436,4 +2447,59 @@
             column="10"/>
     </issue>
 
+    <issue
+        id="DeprecatedWidgetInXml"
+        message="Always favor the use of the Design System Component"
+        errorLine1="        &lt;TextView"
+        errorLine2="         ~~~~~~~~">
+        <location
+            file="src/main/res/layout/autofill_remote_view.xml"
+            line="29"
+            column="10"/>
+    </issue>
+
+    <issue
+        id="DeprecatedWidgetInXml"
+        message="Always favor the use of the Design System Component"
+        errorLine1="        &lt;TextView"
+        errorLine2="         ~~~~~~~~">
+        <location
+            file="src/main/res/layout/autofill_remote_view.xml"
+            line="36"
+            column="10"/>
+    </issue>
+
+    <issue
+        id="InvalidColorAttribute"
+        message="@colors are not allowed, used ?attr/daxColor instead"
+        errorLine1="    android:background=&quot;@color/gray0&quot;>"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/res/layout/autofill_remote_view.xml"
+            line="11"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="InvalidColorAttribute"
+        message="@colors are not allowed, used ?attr/daxColor instead"
+        errorLine1="            android:textColor=&quot;@color/gray100&quot;/>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/res/layout/autofill_remote_view.xml"
+            line="34"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="InvalidColorAttribute"
+        message="@colors are not allowed, used ?attr/daxColor instead"
+        errorLine1="            android:textColor=&quot;@color/gray100&quot;/>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/res/layout/autofill_remote_view.xml"
+            line="41"
+            column="13"/>
+    </issue>
+
 </issues>
diff --git a/...ll-impl/src/main/java/com/duckduckgo/autofill/impl/service/AutofillProviderSuggestions.kt b/...ll-impl/src/main/java/com/duckduckgo/autofill/impl/service/AutofillProviderSuggestions.kt
@@ -20,7 +20,6 @@ import android.annotation.SuppressLint
 import android.app.PendingIntent
 import android.content.Context
 import android.content.Intent
-import android.os.Build.VERSION_CODES
 import android.service.autofill.Dataset
 import android.service.autofill.FillRequest
 import android.service.autofill.FillResponse
@@ -142,7 +141,7 @@ class RealAutofillProviderSuggestions @Inject constructor(
         return ddgAppDataSetBuild
     }
 
-    @RequiresApi(VERSION_CODES.R)
+    @RequiresApi(30)
     private fun Dataset.Builder.addInlinePresentationsIfSupported(
         context: Context,
         request: FillRequest,

diff --git a/...ll-impl/src/main/java/com/duckduckgo/autofill/impl/service/AutofillServiceViewProvider.kt b/...ll-impl/src/main/java/com/duckduckgo/autofill/impl/service/AutofillServiceViewProvider.kt
@@ -21,7 +21,6 @@ import android.app.PendingIntent
 import android.app.slice.Slice
 import android.content.Context
 import android.graphics.drawable.Icon
-import android.os.Build.VERSION_CODES
 import android.service.autofill.InlinePresentation
 import android.widget.RemoteViews
 import android.widget.inline.InlinePresentationSpec
@@ -72,7 +71,7 @@ class RealAutofillServiceViewProvider @Inject constructor(
         iconRes = icon,
     )
 
-    @RequiresApi(VERSION_CODES.R)
+    @RequiresApi(30)
     override fun createInlinePresentation(
         context: Context,
         pendingIntent: PendingIntent,
@@ -89,7 +88,7 @@ class RealAutofillServiceViewProvider @Inject constructor(
         return null
     }
 
-    @RequiresApi(VERSION_CODES.R)
+    @RequiresApi(30)
     private fun isInlineSuggestionSupported(inlinePresentationSpec: InlinePresentationSpec?): Boolean {
         // requires >= android 11
         return if (appBuildConfig.sdkInt >= 30 && inlinePresentationSpec != null) {
@@ -100,7 +99,7 @@ class RealAutofillServiceViewProvider @Inject constructor(
     }
 
     @SuppressLint("RestrictedApi") // because getSlice, but docs clearly indicate you need to use that method.
-    @RequiresApi(VERSION_CODES.R)
+    @RequiresApi(30)
     private fun createSlice(
         context: Context,
         pendingIntent: PendingIntent,

diff --git a/...src/test/java/com/duckduckgo/autofill/impl/service/RealAutofillProviderSuggestionsTest.kt b/...src/test/java/com/duckduckgo/autofill/impl/service/RealAutofillProviderSuggestionsTest.kt
@@ -16,7 +16,6 @@
 
 package com.duckduckgo.autofill.impl.service
 
-import android.os.Build.VERSION_CODES
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.platform.app.InstrumentationRegistry
 import com.duckduckgo.appbuildconfig.api.AppBuildConfig
@@ -44,7 +43,7 @@ class RealAutofillProviderSuggestionsTest {
     private val context = InstrumentationRegistry.getInstrumentation().targetContext
 
     private val appBuildConfig = mock<AppBuildConfig>().apply {
-        whenever(sdkInt).thenReturn(VERSION_CODES.R)
+        whenever(sdkInt).thenReturn(30)
     }
 
     private val autofillStore = mock<AutofillStore>()
@@ -68,7 +67,7 @@ class RealAutofillProviderSuggestionsTest {
         val credentials = listOf(
             LoginCredentials(1L, "username", "password", "example.com"),
         )
-        whenever(appBuildConfig.sdkInt).thenReturn(VERSION_CODES.Q)
+        whenever(appBuildConfig.sdkInt).thenReturn(29)
         whenever(autofillStore.getCredentials(any())).thenReturn(credentials)
         whenever(mockViewProvider.createFormPresentation(any(), any(), any(), any())).thenReturn(mock())
         whenever(mockViewProvider.createInlinePresentation(any(), any(), any(), any(), any(), any())).thenReturn(null)