Merge branch 'components-v128.0' into 'develop'

Update Android Components to 128.0 See merge request censorship-no/ceno-browser!177
censorship-no · Jul 15, 2024 · b2e4aff · b2e4aff
2 parents 1967bb5 + 5958c44
commit b2e4aff
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 7 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -357,6 +357,7 @@ dependencies {
     implementation libs.mozilla.browserdomains
     implementation libs.mozilla.browsertabstray
     implementation libs.mozilla.browsertoolbar
+    implementation libs.mozilla.browsertoolbar2
     implementation libs.mozilla.browsermenu
     implementation libs.mozilla.browsermenu2
     implementation libs.mozilla.browsersessionstorage

diff --git a/app/src/main/java/ie/equalit/ceno/addons/AddonDetailsFragment.kt b/app/src/main/java/ie/equalit/ceno/addons/AddonDetailsFragment.kt
@@ -70,7 +70,7 @@ class AddonDetailsFragment : Fragment() {
             val ratingView = rootView.findViewById<RatingBar>(R.id.rating_view)
             val userCountView = rootView.findViewById<TextView>(R.id.users_count)
 
-            val ratingContentDescription = getString(R.string.mozac_feature_addons_rating_content_description)
+            val ratingContentDescription = getString(R.string.mozac_feature_addons_rating_content_description_2)
             ratingView.contentDescription = String.format(ratingContentDescription, it.average)
             ratingView.rating = it.average
 

diff --git a/app/src/main/java/ie/equalit/ceno/addons/AddonsFragment.kt b/app/src/main/java/ie/equalit/ceno/addons/AddonsFragment.kt
@@ -135,6 +135,7 @@ class AddonsFragment : Fragment(), AddonsManagerAdapterDelegate {
 
         val dialog = PermissionsDialogFragment.newInstance(
             addon = addon,
+            permissions = emptyList(), // TODO: which permissions?
             onPositiveButtonClicked = onPositiveButtonClicked,
         )
 

diff --git a/app/src/main/java/ie/equalit/ceno/addons/InstalledAddOnDetailsFragment.kt b/app/src/main/java/ie/equalit/ceno/addons/InstalledAddOnDetailsFragment.kt
@@ -218,7 +218,7 @@ class InstalledAddOnDetailsFragment : Fragment() {
         val text = if (checked) {
             R.string.mozac_feature_addons_enabled
         } else {
-            R.string.mozac_feature_addons_disabled
+            R.string.mozac_feature_addons_disabled_section
         }
         setText(text)
         isChecked = checked

diff --git a/app/src/main/res/layout/fragment_addon_details.xml b/app/src/main/res/layout/fragment_addon_details.xml
@@ -29,7 +29,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_below="@+id/details"
-            android:text="@string/mozac_feature_addons_authors" />
+            android:text="@string/mozac_feature_addons_author" />
 
         <TextView
             android:id="@+id/author_text"

diff --git a/app/src/main/res/layout/fragment_installed_add_on_details.xml b/app/src/main/res/layout/fragment_installed_add_on_details.xml
@@ -25,7 +25,7 @@
             android:checked="true"
             android:clickable="true"
             android:focusable="true"
-            android:text="@string/mozac_feature_addons_settings_off"
+            android:text="@string/mozac_feature_addons_enabled"
             android:padding="16dp"
             android:textSize="18sp"/>
 

diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
@@ -45,7 +45,8 @@
             android:key="@string/pref_key_add_ons"
             android:title="@string/preferences_add_ons"
             android:layout="@layout/ceno_clickable_preference"
-            app:iconSpaceReserved="false" />
+            app:iconSpaceReserved="false"
+            app:isPreferenceVisible="false" />
 
         <androidx.preference.SwitchPreferenceCompat
             android:defaultValue="false"
@@ -139,7 +140,8 @@
         <androidx.preference.Preference
             android:key="@string/pref_key_override_amo_collection"
             android:title="@string/preferences_customize_amo_collection"
-            app:iconSpaceReserved="false" />
+            app:iconSpaceReserved="false"
+            app:isPreferenceVisible="false"/>
 
         <androidx.preference.Preference
             android:defaultValue="false"

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -13,13 +13,14 @@ androidx_swiperefreshlayout = "1.1.0"
 androidx_work = "2.9.0"
 
 # Android Components
-android_components = "127.0.1"
+android_components = "128.0"
 
 # Google
 google_composecompiler = "1.5.11"
 google_material = "1.12.0"
 
 # Gradle
+#noinspection AndroidGradlePluginVersion
 gradle_android_plugin = "8.5.0"
 gradle_kotlin_plugin = "1.9.23"
 
@@ -73,6 +74,7 @@ mozilla-browsersessionstorage = { group = "org.mozilla.components", name = "brow
 mozilla-browserstate = { group = "org.mozilla.components", name = "browser-state", version.ref = "android_components" }
 mozilla-browsertabstray = { group = "org.mozilla.components", name = "browser-tabstray", version.ref = "android_components" }
 mozilla-browsertoolbar = { group = "org.mozilla.components", name = "browser-toolbar", version.ref = "android_components" }
+mozilla-browsertoolbar2 = { group = "org.mozilla.components", name = "browser-toolbar2", version.ref = "android_components" }
 mozilla-browsermenu = { group = "org.mozilla.components", name = "browser-menu", version.ref = "android_components" }
 mozilla-browsermenu2 = { group = "org.mozilla.components", name = "browser-menu2", version.ref = "android_components" }
 mozilla-browserstoragesync = { group = "org.mozilla.components", name = "browser-storage-sync", version.ref = "android_components" }