From 06a48206e61b99c3bd35b1f4e79424ff270ce60f Mon Sep 17 00:00:00 2001 From: Ryan VanderMeulen Date: Fri, 8 Mar 2024 10:52:56 -0500 Subject: [PATCH] Revert "Bug 1876398 - Update AndroidX Compose to version 1.6.1" because it depends on the AGP 8.3.0 update This reverts commits 256fa9607e9afdfe8567747d1c6f63cbc7bf918e, 1d08590f1813f176fcb3973443b2785640a13141, and 2ba9b2bc6eae0b6c1626eb161868b4efb495c0db --- app/src/main/java/org/mozilla/fenix/compose/SwipeToDismiss.kt | 2 -- .../fenix/translations/TranslationsDialogBottomSheet.kt | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/org/mozilla/fenix/compose/SwipeToDismiss.kt b/app/src/main/java/org/mozilla/fenix/compose/SwipeToDismiss.kt index 2c9b283c7..3668cbf64 100644 --- a/app/src/main/java/org/mozilla/fenix/compose/SwipeToDismiss.kt +++ b/app/src/main/java/org/mozilla/fenix/compose/SwipeToDismiss.kt @@ -2,8 +2,6 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -@file:Suppress("DEPRECATION") // to be handled in https://bugzilla.mozilla.org/show_bug.cgi?id=1881735 - package org.mozilla.fenix.compose import androidx.compose.foundation.background diff --git a/app/src/main/java/org/mozilla/fenix/translations/TranslationsDialogBottomSheet.kt b/app/src/main/java/org/mozilla/fenix/translations/TranslationsDialogBottomSheet.kt index 58cb862bc..fd0be1f47 100644 --- a/app/src/main/java/org/mozilla/fenix/translations/TranslationsDialogBottomSheet.kt +++ b/app/src/main/java/org/mozilla/fenix/translations/TranslationsDialogBottomSheet.kt @@ -632,12 +632,12 @@ private fun TranslationsDropdown( offset = if (isInLandscapeMode) { DpOffset( -contextMenuWidthDp + ICON_SIZE, - ICON_SIZE, + -ICON_SIZE, ) } else { DpOffset( 0.dp, - ICON_SIZE, + -ICON_SIZE, ) }, )