Skip to content

Commit d3c4664

Browse files
Move NavigationExt to extensions package
1 parent edfbb9d commit d3c4664

19 files changed

+25
-19
lines changed

app/src/main/java/com/infomaniak/mail/ui/LaunchActivity.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ import com.infomaniak.mail.ui.login.LoginActivityArgs
3333
import com.infomaniak.mail.ui.main.folder.ThreadListFragmentArgs
3434
import com.infomaniak.mail.utils.AccountUtils
3535
import com.infomaniak.mail.utils.SentryDebug
36-
import com.infomaniak.mail.utils.launchLoginActivity
36+
import com.infomaniak.mail.utils.extensions.launchLoginActivity
3737
import dagger.hilt.android.AndroidEntryPoint
3838
import kotlinx.coroutines.CoroutineDispatcher
3939
import kotlinx.coroutines.launch

app/src/main/java/com/infomaniak/mail/ui/bottomSheetDialogs/SyncDiscoveryBottomSheetDialog.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package com.infomaniak.mail.ui.bottomSheetDialogs
1919

2020
import com.infomaniak.mail.MatomoMail.trackSyncAutoConfigEvent
2121
import com.infomaniak.mail.R
22-
import com.infomaniak.mail.utils.launchSyncAutoConfigActivityForResult
22+
import com.infomaniak.mail.utils.extensions.launchSyncAutoConfigActivityForResult
2323

2424
class SyncDiscoveryBottomSheetDialog : DiscoveryBottomSheetDialog() {
2525

app/src/main/java/com/infomaniak/mail/ui/main/folder/TwoPaneFragment.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ import com.infomaniak.mail.ui.main.thread.ThreadFragment
3939
import com.infomaniak.mail.utils.extensions.AttachmentExt
4040
import com.infomaniak.mail.utils.UiUtils.FULLY_SLID
4141
import com.infomaniak.mail.utils.UiUtils.progressivelyColorSystemBars
42-
import com.infomaniak.mail.utils.safeNavigateToNewMessageActivity
42+
import com.infomaniak.mail.utils.extensions.safeNavigateToNewMessageActivity
4343
import com.infomaniak.mail.utils.extensions.setSystemBarsColors
4444
import javax.inject.Inject
4545

app/src/main/java/com/infomaniak/mail/ui/main/menu/MenuDrawerFragment.kt

+1
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ import com.infomaniak.mail.ui.main.MailboxListFragment
5353
import com.infomaniak.mail.ui.main.folder.ThreadListFragmentDirections
5454
import com.infomaniak.mail.utils.*
5555
import com.infomaniak.mail.utils.ConfettiUtils.ConfettiType
56+
import com.infomaniak.mail.utils.extensions.launchSyncAutoConfigActivityForResult
5657
import com.infomaniak.mail.utils.extensions.observeNotNull
5758
import com.infomaniak.mail.utils.extensions.toggleChevron
5859
import dagger.hilt.android.AndroidEntryPoint

app/src/main/java/com/infomaniak/mail/ui/main/settings/SettingsFragment.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ import com.infomaniak.mail.data.LocalSettings
3737
import com.infomaniak.mail.data.models.FeatureFlag
3838
import com.infomaniak.mail.databinding.FragmentSettingsBinding
3939
import com.infomaniak.mail.ui.MainViewModel
40-
import com.infomaniak.mail.utils.animatedNavigation
41-
import com.infomaniak.mail.utils.launchSyncAutoConfigActivityForResult
40+
import com.infomaniak.mail.utils.extensions.animatedNavigation
41+
import com.infomaniak.mail.utils.extensions.launchSyncAutoConfigActivityForResult
4242
import com.infomaniak.mail.utils.extensions.observeNotNull
4343
import com.infomaniak.mail.utils.extensions.setSystemBarsColors
4444
import dagger.hilt.android.AndroidEntryPoint

app/src/main/java/com/infomaniak/mail/ui/main/settings/mailbox/MailboxSettingsFragment.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import com.infomaniak.lib.core.utils.safeBinding
2727
import com.infomaniak.mail.R
2828
import com.infomaniak.mail.databinding.FragmentMailboxSettingsBinding
2929
import com.infomaniak.mail.ui.main.settings.ItemSettingView
30-
import com.infomaniak.mail.utils.animatedNavigation
30+
import com.infomaniak.mail.utils.extensions.animatedNavigation
3131
import com.infomaniak.mail.utils.extensions.notYetImplemented
3232
import com.infomaniak.mail.utils.extensions.setSystemBarsColors
3333

app/src/main/java/com/infomaniak/mail/ui/main/settings/send/SendSettingsFragment.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import com.infomaniak.lib.core.utils.safeBinding
2626
import com.infomaniak.mail.R
2727
import com.infomaniak.mail.data.LocalSettings
2828
import com.infomaniak.mail.databinding.FragmentSendSettingsBinding
29-
import com.infomaniak.mail.utils.animatedNavigation
29+
import com.infomaniak.mail.utils.extensions.animatedNavigation
3030
import com.infomaniak.mail.utils.extensions.notYetImplemented
3131
import dagger.hilt.android.AndroidEntryPoint
3232
import javax.inject.Inject

app/src/main/java/com/infomaniak/mail/ui/main/settings/swipe/SwipeActionsSettingsFragment.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import com.infomaniak.mail.R
3030
import com.infomaniak.mail.data.LocalSettings
3131
import com.infomaniak.mail.data.LocalSettings.SwipeAction
3232
import com.infomaniak.mail.databinding.FragmentSwipeActionsSettingsBinding
33-
import com.infomaniak.mail.utils.animatedNavigation
33+
import com.infomaniak.mail.utils.extensions.animatedNavigation
3434
import com.infomaniak.mail.utils.extensions.setSystemBarsColors
3535
import dagger.hilt.android.AndroidEntryPoint
3636
import javax.inject.Inject

app/src/main/java/com/infomaniak/mail/ui/main/thread/DetailedContactBottomSheetDialog.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import com.infomaniak.mail.ui.main.SnackbarManager
3131
import com.infomaniak.mail.ui.main.thread.actions.ActionsBottomSheetDialog
3232
import com.infomaniak.mail.ui.newMessage.NewMessageActivityArgs
3333
import com.infomaniak.mail.utils.extensions.copyRecipientEmailToClipboard
34-
import com.infomaniak.mail.utils.safeNavigateToNewMessageActivity
34+
import com.infomaniak.mail.utils.extensions.safeNavigateToNewMessageActivity
3535
import dagger.hilt.android.AndroidEntryPoint
3636
import javax.inject.Inject
3737

app/src/main/java/com/infomaniak/mail/ui/main/thread/actions/AttachmentActionsBottomSheetDialog.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ import com.infomaniak.mail.utils.extensions.AttachmentExt.AttachmentIntentType
3535
import com.infomaniak.mail.utils.extensions.AttachmentExt.executeIntent
3636
import com.infomaniak.mail.utils.extensions.AttachmentExt.openAttachment
3737
import com.infomaniak.mail.utils.PermissionUtils
38-
import com.infomaniak.mail.utils.navigateToDownloadProgressDialog
38+
import com.infomaniak.mail.utils.extensions.navigateToDownloadProgressDialog
3939
import dagger.hilt.android.AndroidEntryPoint
4040
import javax.inject.Inject
4141

app/src/main/java/com/infomaniak/mail/ui/main/thread/actions/MessageActionsBottomSheetDialog.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,10 @@ import com.infomaniak.mail.data.models.draft.Draft.DraftMode
4040
import com.infomaniak.mail.ui.alertDialogs.DescriptionAlertDialog
4141
import com.infomaniak.mail.ui.main.menu.MoveFragmentArgs
4242
import com.infomaniak.mail.ui.main.thread.PrintMailFragmentArgs
43-
import com.infomaniak.mail.utils.animatedNavigation
43+
import com.infomaniak.mail.utils.extensions.animatedNavigation
4444
import com.infomaniak.mail.utils.extensions.deleteWithConfirmationPopup
4545
import com.infomaniak.mail.utils.extensions.notYetImplemented
46-
import com.infomaniak.mail.utils.safeNavigateToNewMessageActivity
46+
import com.infomaniak.mail.utils.extensions.safeNavigateToNewMessageActivity
4747
import dagger.hilt.android.AndroidEntryPoint
4848
import javax.inject.Inject
4949

app/src/main/java/com/infomaniak/mail/ui/main/thread/actions/MultiSelectBottomSheetDialog.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ import com.infomaniak.mail.ui.alertDialogs.DescriptionAlertDialog
3838
import com.infomaniak.mail.ui.main.folder.ThreadListFragmentDirections
3939
import com.infomaniak.mail.ui.main.folder.ThreadListMultiSelection
4040
import com.infomaniak.mail.ui.main.folder.ThreadListMultiSelection.Companion.getReadIconAndShortText
41-
import com.infomaniak.mail.utils.animatedNavigation
41+
import com.infomaniak.mail.utils.extensions.animatedNavigation
4242
import com.infomaniak.mail.utils.extensions.deleteWithConfirmationPopup
4343
import dagger.hilt.android.AndroidEntryPoint
4444
import javax.inject.Inject

app/src/main/java/com/infomaniak/mail/ui/main/thread/actions/ReplyBottomSheetDialog.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import com.infomaniak.mail.MatomoMail.trackEvent
2929
import com.infomaniak.mail.R
3030
import com.infomaniak.mail.data.models.draft.Draft.DraftMode
3131
import com.infomaniak.mail.databinding.BottomSheetReplyBinding
32-
import com.infomaniak.mail.utils.safeNavigateToNewMessageActivity
32+
import com.infomaniak.mail.utils.extensions.safeNavigateToNewMessageActivity
3333

3434
open class ReplyBottomSheetDialog : ActionsBottomSheetDialog() {
3535

app/src/main/java/com/infomaniak/mail/ui/main/thread/actions/ThreadActionsBottomSheetDialog.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,10 @@ import com.infomaniak.mail.data.models.draft.Draft.DraftMode
4343
import com.infomaniak.mail.data.models.thread.Thread
4444
import com.infomaniak.mail.ui.alertDialogs.DescriptionAlertDialog
4545
import com.infomaniak.mail.ui.main.menu.MoveFragmentArgs
46-
import com.infomaniak.mail.utils.animatedNavigation
46+
import com.infomaniak.mail.utils.extensions.animatedNavigation
4747
import com.infomaniak.mail.utils.extensions.deleteWithConfirmationPopup
4848
import com.infomaniak.mail.utils.extensions.notYetImplemented
49-
import com.infomaniak.mail.utils.safeNavigateToNewMessageActivity
49+
import com.infomaniak.mail.utils.extensions.safeNavigateToNewMessageActivity
5050
import dagger.hilt.android.AndroidEntryPoint
5151
import javax.inject.Inject
5252

app/src/main/java/com/infomaniak/mail/ui/main/user/AccountFragment.kt

+1
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ import com.infomaniak.mail.ui.main.MailboxListFragment
4444
import com.infomaniak.mail.ui.main.menu.MailboxesAdapter
4545
import com.infomaniak.mail.utils.*
4646
import com.infomaniak.mail.utils.ConfettiUtils.ConfettiType
47+
import com.infomaniak.mail.utils.extensions.animatedNavigation
4748
import com.infomaniak.mail.utils.extensions.bindAlertToViewLifecycle
4849
import com.infomaniak.mail.utils.extensions.setSystemBarsColors
4950
import dagger.hilt.android.AndroidEntryPoint

app/src/main/java/com/infomaniak/mail/ui/main/user/SwitchUserFragment.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import com.infomaniak.lib.core.utils.safeBinding
2828
import com.infomaniak.mail.MatomoMail.trackAccountEvent
2929
import com.infomaniak.mail.databinding.FragmentSwitchUserBinding
3030
import com.infomaniak.mail.utils.AccountUtils
31-
import com.infomaniak.mail.utils.launchLoginActivity
31+
import com.infomaniak.mail.utils.extensions.launchLoginActivity
3232
import com.infomaniak.mail.utils.extensions.setSystemBarsColors
3333
import dagger.hilt.android.AndroidEntryPoint
3434

app/src/main/java/com/infomaniak/mail/utils/AccountUtils.kt

+2
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ import com.infomaniak.mail.data.cache.RealmDatabase
3030
import com.infomaniak.mail.data.cache.appSettings.AppSettingsController
3131
import com.infomaniak.mail.data.models.AppSettings
3232
import com.infomaniak.mail.data.models.mailbox.Mailbox
33+
import com.infomaniak.mail.utils.extensions.launchNoMailboxActivity
34+
import com.infomaniak.mail.utils.extensions.launchNoValidMailboxesActivity
3335
import io.sentry.Sentry
3436
import kotlinx.coroutines.Dispatchers
3537
import kotlinx.coroutines.invoke

app/src/main/java/com/infomaniak/mail/utils/LoginUtils.kt

+2
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@ import com.infomaniak.mail.di.IoDispatcher
3434
import com.infomaniak.mail.di.MainDispatcher
3535
import com.infomaniak.mail.ui.login.LoginActivity
3636
import com.infomaniak.mail.utils.Utils.MailboxErrorCode
37+
import com.infomaniak.mail.utils.extensions.launchNoMailboxActivity
38+
import com.infomaniak.mail.utils.extensions.launchNoValidMailboxesActivity
3739
import dagger.hilt.android.scopes.ActivityScoped
3840
import kotlinx.coroutines.CoroutineDispatcher
3941
import kotlinx.coroutines.launch

app/src/main/java/com/infomaniak/mail/utils/NavigationExtensions.kt app/src/main/java/com/infomaniak/mail/utils/extensions/NavigationExt.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* You should have received a copy of the GNU General Public License
1616
* along with this program. If not, see <http://www.gnu.org/licenses/>.
1717
*/
18-
package com.infomaniak.mail.utils
18+
package com.infomaniak.mail.utils.extensions
1919

2020
import android.content.Context
2121
import android.content.Intent
@@ -38,7 +38,7 @@ import com.infomaniak.mail.ui.login.NoMailboxActivity
3838
import com.infomaniak.mail.ui.main.thread.actions.AttachmentActionsBottomSheetDialog
3939
import com.infomaniak.mail.ui.newMessage.NewMessageActivityArgs
4040
import com.infomaniak.mail.ui.noValidMailboxes.NoValidMailboxesActivity
41-
import com.infomaniak.mail.utils.extensions.AttachmentExt
41+
import com.infomaniak.mail.utils.AccountUtils
4242
import com.infomaniak.mail.utils.extensions.AttachmentExt.createDownloadDialogNavArgs
4343

4444
fun getAnimatedNavOptions() = NavOptions

0 commit comments

Comments
 (0)