tor-browser

commit 4f593ec7f60f4f5bd7f78175c123ea7c90aae1b1
parent 372ff2cc65d6a690b8448631f7c089d3a58c4f7e
Author: t-p-white <towhite@mozilla.com>
Date:   Thu,  8 Jan 2026 10:50:13 +0000

Bug 2008712 - Part 2: Refactor `TermsOfUseBottomSheet` to decouple the ToU content and "Learn more" content being defined in the same Composable to enable alternative "Learn more" content. r=android-reviewers,joberhauser

Differential Revision: https://phabricator.services.mozilla.com/D278007

Diffstat:
M
mobile/android/fenix/app/src/main/java/org/mozilla/fenix/termsofuse/ui/TermsOfUseBottomSheet.kt
 | 
31
++++++++++++++++---------------

1 file changed, 16 insertions(+), 15 deletions(-)
diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/termsofuse/ui/TermsOfUseBottomSheet.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/termsofuse/ui/TermsOfUseBottomSheet.kt
@@ -171,11 +171,11 @@ private fun BottomSheetContent(
 
         Spacer(Modifier.size(20.dp))
 
-        BottomSheetMessage(
-            onTermsOfUseClicked = onTermsOfUseClicked,
-            onPrivacyNoticeClicked = onPrivacyNoticeClicked,
-            onLearnMoreClicked = onLearnMoreClicked,
-        )
+        TermsOfUseContent(onTermsOfUseClicked, onPrivacyNoticeClicked)
+
+        Spacer(Modifier.size(20.dp))
+
+        LearnMoreContent(onLearnMoreClicked)
 
         Spacer(Modifier.size(34.dp))
 
@@ -208,10 +208,9 @@ private fun BottomSheetContent(
 }
 
 @Composable
-private fun BottomSheetMessage(
-    onTermsOfUseClicked: () -> Unit = {},
-    onPrivacyNoticeClicked: () -> Unit = {},
-    onLearnMoreClicked: () -> Unit = {},
+private fun TermsOfUseContent(
+    onTermsOfUseClicked: () -> Unit,
+    onPrivacyNoticeClicked: () -> Unit,
 ) {
     val termsOfUseLinkState = LinkTextState(
         text = stringResource(R.string.terms_of_use_prompt_link_terms_of_use),
@@ -223,11 +222,6 @@ private fun BottomSheetMessage(
         url = "",
         onClick = { onPrivacyNoticeClicked() },
     )
-    val learnMoreLinkState = LinkTextState(
-        text = stringResource(R.string.terms_of_use_prompt_link_learn_more),
-        url = "",
-        onClick = { onLearnMoreClicked() },
-    )
 
     LinkText(
         text = stringResource(
@@ -245,8 +239,15 @@ private fun BottomSheetMessage(
         ),
         linkTextDecoration = TextDecoration.Underline,
     )
+}
 
-    Spacer(Modifier.size(20.dp))
+@Composable
+private fun LearnMoreContent(onLearnMoreClicked: () -> Unit) {
+    val learnMoreLinkState = LinkTextState(
+        text = stringResource(R.string.terms_of_use_prompt_link_learn_more),
+        url = "",
+        onClick = { onLearnMoreClicked() },
+    )
 
     LinkText(
         text = stringResource(