Merge pull request 'bump' (#182) from bump into master

Reviewed-on: #182

androidApp/src/androidTest/kotlin/bou/amine/apps/readerforselfossv2/android/HomeActivityTest.kt

@@ -56,7 +56,7 @@ class HomeActivityTest {
     fun testMenuActions() {
         onView(withId(R.id.action_search)).perform(click())
         onView(
-            withId(R.id.search_src_text),
+            withId(com.google.android.material.R.id.search_src_text),
         ).check(matches(isFocused()))
         onView(isRoot()).perform(ViewActions.pressBack())
 

androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/fragments/ArticleFragment.kt

@@ -118,8 +118,8 @@ class ArticleFragment :
                 e.sendSilentlyWithAcra()
             }
 
-            colorOnSurface = getColorFromAttr(R.attr.colorOnSurface)
+            colorOnSurface = getColorFromAttr(com.google.android.material.R.attr.colorOnSurface)
-            colorSurface = getColorFromAttr(R.attr.colorSurface)
+            colorSurface = getColorFromAttr(com.google.android.material.R.attr.colorSurface)
 
             contentText = item.content
             contentTitle = item.title.getHtmlDecoded()

androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/fragments/FilterSheetFragment.kt

@@ -83,7 +83,15 @@ class FilterSheetFragment :
         val sourceGroup = binding.sourcesGroup
 
         repository.getSourcesDetailsOrStats().forEachIndexed { _, source ->
-            val c = Chip(context)
+            val c: Chip? =
+                maybeIfContext {
+                    Chip(it)
+                } as Chip?
+
+            if (c == null) {
+                return
+            }
+
             c.ellipsize = TextUtils.TruncateAt.END
 
             maybeIfContext {
@@ -145,7 +153,11 @@ class FilterSheetFragment :
         val tags = repository.getTags()
 
         tags.forEachIndexed { _, tag ->
-            val c = Chip(context)
+            val c: Chip? = maybeIfContext { Chip(it) } as Chip?
+            if (c == null) {
+                return
+            }
+
             c.ellipsize = TextUtils.TruncateAt.END
             c.text = tag.tag
 

gradle.properties

@@ -19,11 +19,11 @@ kotlin.code.style=official
 android.useAndroidX=true
 #android.nonTransitiveRClass=true
 android.enableJetifier=false
-android.nonTransitiveRClass=false
+android.nonTransitiveRClass=true
 #MPP
 kotlin.mpp.enableCInteropCommonization=true
 org.gradle.parallel=true
 org.gradle.caching=true
 ignoreGitVersion=false
 kotlin.native.cacheKind.iosX64=none
-org.gradle.configureondemand=true
+org.gradle.configureondemand=true