From 9b7891330d660260a47a01200aed02f981957aed Mon Sep 17 00:00:00 2001 From: Kevin Boulongne Date: Fri, 28 Feb 2025 11:09:34 +0100 Subject: [PATCH] refactor: Move `goToPlayStore()` from Legacy to new Core --- Core | 2 +- .../bottomSheetDialogs/UpdateAvailableBottomSheetDialog.kt | 2 +- .../infomaniak/mail/ui/main/folder/ThreadListFragment.kt | 6 +++++- .../main/thread/actions/DownloadMessagesProgressDialog.kt | 2 +- .../com/infomaniak/mail/ui/sync/SyncConfigureFragment.kt | 2 +- .../mail/utils/extensions/AttachmentExtensions.kt | 4 +--- 6 files changed, 10 insertions(+), 8 deletions(-) diff --git a/Core b/Core index aa190d6364..39c830143a 160000 --- a/Core +++ b/Core @@ -1 +1 @@ -Subproject commit aa190d63648be7108c0306045eb5b601d4128c25 +Subproject commit 39c830143a15ef20fd7d5bfdca0ab228e78667b6 diff --git a/app/src/main/java/com/infomaniak/mail/ui/bottomSheetDialogs/UpdateAvailableBottomSheetDialog.kt b/app/src/main/java/com/infomaniak/mail/ui/bottomSheetDialogs/UpdateAvailableBottomSheetDialog.kt index 0e2c8580a5..dae213354b 100644 --- a/app/src/main/java/com/infomaniak/mail/ui/bottomSheetDialogs/UpdateAvailableBottomSheetDialog.kt +++ b/app/src/main/java/com/infomaniak/mail/ui/bottomSheetDialogs/UpdateAvailableBottomSheetDialog.kt @@ -21,9 +21,9 @@ import android.content.DialogInterface import android.os.Bundle import android.view.View import androidx.fragment.app.activityViewModels +import com.infomaniak.core.extensions.goToPlayStore import com.infomaniak.lib.core.utils.context import com.infomaniak.lib.core.utils.getAppName -import com.infomaniak.lib.core.utils.goToPlayStore import com.infomaniak.lib.stores.StoresSettingsRepository import com.infomaniak.lib.stores.StoresViewModel import com.infomaniak.mail.MatomoMail.DISCOVER_LATER diff --git a/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListFragment.kt b/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListFragment.kt index bd2f3912b2..bf1b1d006b 100644 --- a/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListFragment.kt +++ b/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListFragment.kt @@ -48,10 +48,14 @@ import com.ernestoyaquello.dragdropswiperecyclerview.listener.OnItemSwipeListene import com.ernestoyaquello.dragdropswiperecyclerview.listener.OnListScrollListener import com.ernestoyaquello.dragdropswiperecyclerview.listener.OnListScrollListener.ScrollDirection import com.ernestoyaquello.dragdropswiperecyclerview.listener.OnListScrollListener.ScrollState +import com.infomaniak.core.extensions.goToPlayStore import com.infomaniak.core.utils.isToday import com.infomaniak.lib.core.MatomoCore.TrackerAction -import com.infomaniak.lib.core.utils.* +import com.infomaniak.lib.core.utils.SentryLog import com.infomaniak.lib.core.utils.SnackbarUtils.showSnackbar +import com.infomaniak.lib.core.utils.context +import com.infomaniak.lib.core.utils.safeNavigate +import com.infomaniak.lib.core.utils.setPaddingRelative import com.infomaniak.lib.stores.updatemanagers.InAppUpdateManager import com.infomaniak.mail.MatomoMail.trackEvent import com.infomaniak.mail.MatomoMail.trackMenuDrawerEvent diff --git a/app/src/main/java/com/infomaniak/mail/ui/main/thread/actions/DownloadMessagesProgressDialog.kt b/app/src/main/java/com/infomaniak/mail/ui/main/thread/actions/DownloadMessagesProgressDialog.kt index b2bc98850e..122cc856ab 100644 --- a/app/src/main/java/com/infomaniak/mail/ui/main/thread/actions/DownloadMessagesProgressDialog.kt +++ b/app/src/main/java/com/infomaniak/mail/ui/main/thread/actions/DownloadMessagesProgressDialog.kt @@ -24,7 +24,7 @@ import android.net.Uri import android.os.Bundle import androidx.fragment.app.viewModels import androidx.navigation.fragment.findNavController -import com.infomaniak.lib.core.utils.goToPlayStore +import com.infomaniak.core.extensions.goToPlayStore import com.infomaniak.lib.core.utils.setBackNavigationResult import com.infomaniak.mail.utils.LocalStorageUtils.clearEmlCacheDir import com.infomaniak.mail.utils.SaveOnKDriveUtils.DRIVE_PACKAGE diff --git a/app/src/main/java/com/infomaniak/mail/ui/sync/SyncConfigureFragment.kt b/app/src/main/java/com/infomaniak/mail/ui/sync/SyncConfigureFragment.kt index a07ed6a2e5..f5212c5291 100644 --- a/app/src/main/java/com/infomaniak/mail/ui/sync/SyncConfigureFragment.kt +++ b/app/src/main/java/com/infomaniak/mail/ui/sync/SyncConfigureFragment.kt @@ -28,9 +28,9 @@ import androidx.core.view.isVisible import androidx.fragment.app.Fragment import androidx.fragment.app.activityViewModels import androidx.navigation.fragment.findNavController +import com.infomaniak.core.extensions.goToPlayStore import com.infomaniak.lib.core.MatomoCore.TrackerAction import com.infomaniak.lib.core.utils.context -import com.infomaniak.lib.core.utils.goToPlayStore import com.infomaniak.lib.core.utils.safeBinding import com.infomaniak.mail.MatomoMail.trackSyncAutoConfigEvent import com.infomaniak.mail.R diff --git a/app/src/main/java/com/infomaniak/mail/utils/extensions/AttachmentExtensions.kt b/app/src/main/java/com/infomaniak/mail/utils/extensions/AttachmentExtensions.kt index e60536a951..fe692b6529 100644 --- a/app/src/main/java/com/infomaniak/mail/utils/extensions/AttachmentExtensions.kt +++ b/app/src/main/java/com/infomaniak/mail/utils/extensions/AttachmentExtensions.kt @@ -20,15 +20,14 @@ package com.infomaniak.mail.utils.extensions import android.content.ComponentName import android.content.Context import android.content.Intent -import android.content.pm.PackageManager import android.os.Bundle import android.provider.MediaStore.Files.FileColumns import androidx.core.content.FileProvider +import com.infomaniak.core.extensions.goToPlayStore import com.infomaniak.lib.core.api.ApiController import com.infomaniak.lib.core.models.ApiResponse import com.infomaniak.lib.core.networking.HttpUtils import com.infomaniak.lib.core.utils.SentryLog -import com.infomaniak.lib.core.utils.goToPlayStore import com.infomaniak.lib.core.utils.hasSupportedApplications import com.infomaniak.mail.R import com.infomaniak.mail.data.api.ApiRoutes @@ -46,7 +45,6 @@ import com.infomaniak.mail.utils.WorkerUtils.UploadMissingLocalFileException import com.infomaniak.mail.utils.extensions.AttachmentExtensions.AttachmentIntentType.OPEN_WITH import com.infomaniak.mail.utils.extensions.AttachmentExtensions.AttachmentIntentType.SAVE_TO_DRIVE import io.realm.kotlin.Realm -import io.sentry.Sentry import okhttp3.MediaType.Companion.toMediaType import okhttp3.Request import okhttp3.RequestBody.Companion.asRequestBody