Merge pull request #1870 from vector-im/feature/rename_package

Rename packages

CHANGES.md

@@ -21,6 +21,9 @@ Build 🧱:
 
 Other changes:
  - Hide Flair settings, this is not implemented yet.
+ - Rename package `im.vector.riotx.attachmentviewer` to `im.vector.lib.attachmentviewer`
+ - Rename package `im.vector.riotx.multipicker` to `im.vector.lib.multipicker`
+ - Rename package `im.vector.riotx` to `im.vector.app`
 
 Changes in Element 1.0.4 (2020-08-03)
 ===================================================

attachment-viewer/src/main/AndroidManifest.xml

@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="im.vector.riotx.attachmentviewer" />
+<manifest package="im.vector.lib.attachmentviewer" />

attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AnimatedImageViewHolder.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.attachmentviewer
+package im.vector.lib.attachmentviewer
 
 import android.view.View
 import android.widget.ImageView

attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AttachmentEvents.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.attachmentviewer
+package im.vector.lib.attachmentviewer
 
 sealed class AttachmentEvents {
     data class VideoEvent(val isPlaying: Boolean, val progress: Int, val duration: Int) : AttachmentEvents()

attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AttachmentSourceProvider.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.attachmentviewer
+package im.vector.lib.attachmentviewer
 
 import android.content.Context
 import android.view.View

attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AttachmentViewerActivity.kt

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.attachmentviewer
+package im.vector.lib.attachmentviewer
 
 import android.graphics.Color
 import android.os.Bundle

attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AttachmentsAdapter.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.attachmentviewer
+package im.vector.lib.attachmentviewer
 
 import android.view.LayoutInflater
 import android.view.ViewGroup

attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/BaseViewHolder.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.attachmentviewer
+package im.vector.lib.attachmentviewer
 
 import android.view.View
 import androidx.recyclerview.widget.RecyclerView

attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/ImageLoaderTarget.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.attachmentviewer
+package im.vector.lib.attachmentviewer
 
 import android.graphics.drawable.Animatable
 import android.graphics.drawable.Drawable

attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/SwipeDirection.kt

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.attachmentviewer
+package im.vector.lib.attachmentviewer
 
 sealed class SwipeDirection {
     object NotDetected : SwipeDirection()

attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/SwipeDirectionDetector.kt

@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2020 New Vector Ltd
- * Copyright (C) 2018 stfalcon.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.attachmentviewer
+package im.vector.lib.attachmentviewer
 
 import android.content.Context
 import android.view.MotionEvent

attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/SwipeToDismissHandler.kt

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.attachmentviewer
+package im.vector.lib.attachmentviewer
 
 import android.animation.Animator
 import android.animation.AnimatorListenerAdapter

attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/VideoLoaderTarget.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.attachmentviewer
+package im.vector.lib.attachmentviewer
 
 import android.graphics.drawable.Drawable
 import android.widget.ImageView

attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/VideoViewHolder.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.attachmentviewer
+package im.vector.lib.attachmentviewer
 
 import android.view.View
 import android.widget.ImageView

attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/ZoomableImageViewHolder.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.attachmentviewer
+package im.vector.lib.attachmentviewer
 
 import android.view.View
 import android.widget.ProgressBar

multipicker/src/main/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="im.vector.riotx.multipicker">
+    package="im.vector.lib.multipicker">
 
     <application>
         <provider

multipicker/src/main/java/im/vector/lib/multipicker/AudioPicker.kt

@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.multipicker
+package im.vector.lib.multipicker
 
 import android.app.Activity
 import android.content.Context
 import android.content.Intent
 import android.media.MediaMetadataRetriever
 import android.provider.MediaStore
-import im.vector.riotx.multipicker.entity.MultiPickerAudioType
+import im.vector.lib.multipicker.entity.MultiPickerAudioType
 
 /**
  * Audio file picker implementation

multipicker/src/main/java/im/vector/lib/multipicker/CameraPicker.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.multipicker
+package im.vector.lib.multipicker
 
 import android.app.Activity
 import android.content.Context
@@ -23,8 +23,8 @@ import android.net.Uri
 import android.provider.MediaStore
 import androidx.core.content.FileProvider
 import androidx.fragment.app.Fragment
-import im.vector.riotx.multipicker.entity.MultiPickerImageType
-import im.vector.riotx.multipicker.utils.ImageUtils
+import im.vector.lib.multipicker.entity.MultiPickerImageType
+import im.vector.lib.multipicker.utils.ImageUtils
 import java.io.File
 import java.text.SimpleDateFormat
 import java.util.Date

multipicker/src/main/java/im/vector/lib/multipicker/ContactPicker.kt

@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.multipicker
+package im.vector.lib.multipicker
 
 import android.app.Activity
 import android.content.ContentResolver
 import android.content.Context
 import android.content.Intent
 import android.provider.ContactsContract
-import im.vector.riotx.multipicker.entity.MultiPickerContactType
+import im.vector.lib.multipicker.entity.MultiPickerContactType
 
 /**
  * Contact Picker implementation

multipicker/src/main/java/im/vector/lib/multipicker/FilePicker.kt

@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.multipicker
+package im.vector.lib.multipicker
 
 import android.app.Activity
 import android.content.Context
 import android.content.Intent
 import android.provider.OpenableColumns
-import im.vector.riotx.multipicker.entity.MultiPickerFileType
+import im.vector.lib.multipicker.entity.MultiPickerFileType
 
 /**
  * Implementation of selecting any type of files

multipicker/src/main/java/im/vector/lib/multipicker/ImagePicker.kt

@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.multipicker
+package im.vector.lib.multipicker
 
 import android.app.Activity
 import android.content.Context
 import android.content.Intent
 import android.provider.MediaStore
-import im.vector.riotx.multipicker.entity.MultiPickerImageType
-import im.vector.riotx.multipicker.utils.ImageUtils
+import im.vector.lib.multipicker.entity.MultiPickerImageType
+import im.vector.lib.multipicker.utils.ImageUtils
 
 /**
  * Image Picker implementation

multipicker/src/main/java/im/vector/lib/multipicker/MultiPicker.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.multipicker
+package im.vector.lib.multipicker
 
 class MultiPicker<T> {
 

multipicker/src/main/java/im/vector/lib/multipicker/Picker.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.multipicker
+package im.vector.lib.multipicker
 
 import android.app.Activity
 import android.content.Context

multipicker/src/main/java/im/vector/lib/multipicker/VideoPicker.kt

@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.multipicker
+package im.vector.lib.multipicker
 
 import android.app.Activity
 import android.content.Context
 import android.content.Intent
 import android.media.MediaMetadataRetriever
 import android.provider.MediaStore
-import im.vector.riotx.multipicker.entity.MultiPickerVideoType
+import im.vector.lib.multipicker.entity.MultiPickerVideoType
 
 /**
  * Video Picker implementation

multipicker/src/main/java/im/vector/lib/multipicker/entity/MultiPickerAudioType.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.multipicker.entity
+package im.vector.lib.multipicker.entity
 
 import android.net.Uri
 

multipicker/src/main/java/im/vector/lib/multipicker/entity/MultiPickerBaseType.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.multipicker.entity
+package im.vector.lib.multipicker.entity
 
 import android.net.Uri
 

multipicker/src/main/java/im/vector/lib/multipicker/entity/MultiPickerContactType.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.multipicker.entity
+package im.vector.lib.multipicker.entity
 
 data class MultiPickerContactType(
         val displayName: String,

multipicker/src/main/java/im/vector/lib/multipicker/entity/MultiPickerFileType.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.multipicker.entity
+package im.vector.lib.multipicker.entity
 
 import android.net.Uri
 

multipicker/src/main/java/im/vector/lib/multipicker/entity/MultiPickerImageType.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.multipicker.entity
+package im.vector.lib.multipicker.entity
 
 import android.net.Uri
 

multipicker/src/main/java/im/vector/lib/multipicker/entity/MultiPickerVideoType.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.multipicker.entity
+package im.vector.lib.multipicker.entity
 
 import android.net.Uri
 

multipicker/src/main/java/im/vector/lib/multipicker/provider/MultiPickerFileProvider.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.multipicker.provider
+package im.vector.lib.multipicker.provider
 
 import androidx.core.content.FileProvider
 

multipicker/src/main/java/im/vector/lib/multipicker/utils/ImageUtils.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.multipicker.utils
+package im.vector.lib.multipicker.utils
 
 import android.content.Context
 import android.graphics.Bitmap

tools/check/forbidden_strings_in_resources.txt

@@ -73,10 +73,10 @@ layout_constraintLeft_
 ### Use Preference from androidx library (androidx.preference.PreferenceScreen)
 <PreferenceScreen
 
-### Use im.vector.riotx.core.preference.VectorSwitchPreference to support multiline of the title
+### Use im.vector.app.core.preference.VectorSwitchPreference to support multiline of the title
 <SwitchPreference
 
-### Use im.vector.riotx.core.preference.VectorPreference to support multiline of the title
+### Use im.vector.app.core.preference.VectorPreference to support multiline of the title
 <Preference\n
 
 ### Will crash on API < 21. Use ?colorAccent instead

tools/debug_alter_scalar_token.sh

@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 
-adb shell am broadcast -a im.vector.riotx.DEBUG_ACTION_ALTER_SCALAR_TOKEN
+adb shell am broadcast -a im.vector.app.DEBUG_ACTION_ALTER_SCALAR_TOKEN

tools/debug_dump_filesystem.sh

@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 
-adb shell am broadcast -a im.vector.riotx.DEBUG_ACTION_DUMP_FILESYSTEM
+adb shell am broadcast -a im.vector.app.DEBUG_ACTION_DUMP_FILESYSTEM

tools/debug_dump_prefs.sh

@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 
-adb shell am broadcast -a im.vector.riotx.DEBUG_ACTION_DUMP_PREFERENCES
+adb shell am broadcast -a im.vector.app.DEBUG_ACTION_DUMP_PREFERENCES

tools/templates/RiotXFeature/root/src/app_package/Action.kt.ftl

@@ -1,5 +1,5 @@
 package ${escapeKotlinIdentifiers(packageName)}
 
-import im.vector.riotx.core.platform.VectorViewModelAction
+import im.vector.app.core.platform.VectorViewModelAction
 
 sealed class ${actionClass}: VectorViewModelAction

tools/templates/RiotXFeature/root/src/app_package/Activity.kt.ftl

@@ -3,10 +3,10 @@ package ${escapeKotlinIdentifiers(packageName)}
 import android.content.Context
 import android.content.Intent
 import androidx.appcompat.widget.Toolbar
-import im.vector.riotx.R
-import im.vector.riotx.core.extensions.addFragment
-import im.vector.riotx.core.platform.ToolbarConfigurable
-import im.vector.riotx.core.platform.VectorBaseActivity
+import im.vector.app.R
+import im.vector.app.core.extensions.addFragment
+import im.vector.app.core.platform.ToolbarConfigurable
+import im.vector.app.core.platform.VectorBaseActivity
 
 //TODO: add this activity to manifest
 class ${activityClass} : VectorBaseActivity(), ToolbarConfigurable {

tools/templates/RiotXFeature/root/src/app_package/Fragment.kt.ftl

@@ -9,8 +9,8 @@ import com.airbnb.mvrx.args
 import android.view.View
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
-import im.vector.riotx.R
-import im.vector.riotx.core.platform.VectorBaseFragment
+import im.vector.app.R
+import im.vector.app.core.platform.VectorBaseFragment
 import javax.inject.Inject
 
 <#if createFragmentArgs>

tools/templates/RiotXFeature/root/src/app_package/ViewEvents.kt.ftl

@@ -1,5 +1,5 @@
 package ${escapeKotlinIdentifiers(packageName)}
 
-import im.vector.riotx.core.platform.VectorViewEvents
+import im.vector.app.core.platform.VectorViewEvents
 
 sealed class ${viewEventsClass} : VectorViewEvents

tools/templates/RiotXFeature/root/src/app_package/ViewModel.kt.ftl

@@ -6,12 +6,12 @@ import com.airbnb.mvrx.MvRxViewModelFactory
 import com.airbnb.mvrx.ViewModelContext
 import com.squareup.inject.assisted.Assisted
 import com.squareup.inject.assisted.AssistedInject
-import im.vector.riotx.core.extensions.exhaustive
-import im.vector.riotx.core.platform.VectorViewModel
+import im.vector.app.core.extensions.exhaustive
+import im.vector.app.core.platform.VectorViewModel
 
 <#if createViewEvents>
 <#else>
-import im.vector.riotx.core.platform.EmptyViewEvents
+import im.vector.app.core.platform.EmptyViewEvents
 </#if>
 
 class ${viewModelClass} @AssistedInject constructor(@Assisted initialState: ${viewStateClass})

tools/tests/app_standby_off.sh

@@ -6,5 +6,5 @@ echo "Standby OFF"
 echo "adb shell dumpsys battery reset"
 adb shell dumpsys battery reset
 
-echo "adb shell am set-inactive im.vector.riotx false"
-adb shell am set-inactive im.vector.riotx false
+echo "adb shell am set-inactive im.vector.app false"
+adb shell am set-inactive im.vector.app false

tools/tests/app_standby_on.sh

@@ -6,5 +6,5 @@ echo "Standby ON"
 echo "adb shell dumpsys battery unplug"
 adb shell dumpsys battery unplug
 
-echo "adb shell am set-inactive im.vector.riotx true"
-adb shell am set-inactive im.vector.riotx true
+echo "adb shell am set-inactive im.vector.app true"
+adb shell am set-inactive im.vector.app true

tools/workmanager/dumpsys_debug.sh

@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 
-adb shell dumpsys jobscheduler im.vector.riotx.debug
+adb shell dumpsys jobscheduler im.vector.app.debug

tools/workmanager/dumpsys_release.sh

@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 
-adb shell dumpsys jobscheduler im.vector.riotx
+adb shell dumpsys jobscheduler im.vector.app

vector/proguard-rules.pro

@@ -20,7 +20,7 @@
 # hide the original source file name.
 #-renamesourcefileattribute SourceFile
 
--keep class im.vector.riotx.features.** { *; }
+-keep class im.vector.app.features.** { *; }
 
 ## print all the rules in a file
 # -printconfiguration ../proguard_files/full-r8-config.txt

vector/src/androidTest/java/im/vector/app/InstrumentedTest.kt

@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package im.vector.riotx
+package im.vector.app
 
 import android.content.Context
 import androidx.test.core.app.ApplicationProvider
-import im.vector.riotx.test.shared.createTimberTestRule
+import im.vector.app.test.shared.createTimberTestRule
 import org.junit.Rule
 
 interface InstrumentedTest {

vector/src/androidTest/java/im/vector/app/core/utils/TemporaryStoreTest.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.utils
+package im.vector.app.core.utils
 
 import org.amshove.kluent.shouldBe
 import org.junit.Test

vector/src/androidTest/java/im/vector/app/features/reactions/data/EmojiDataSourceTest.kt

@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.reactions.data
+package im.vector.app.features.reactions.data
 
-import im.vector.riotx.InstrumentedTest
+import im.vector.app.InstrumentedTest
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertTrue
 import org.junit.FixMethodOrder

vector/src/debug/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="im.vector.riotx">
+    package="im.vector.app">
 
     <application>
         <activity android:name=".features.debug.TestLinkifyActivity" />

vector/src/debug/java/im/vector/app/features/debug/DebugMaterialThemeActivity.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.debug
+package im.vector.app.features.debug
 
 import android.os.Bundle
 import android.view.Menu
@@ -22,8 +22,8 @@ import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 import com.google.android.material.snackbar.Snackbar
-import im.vector.riotx.R
-import im.vector.riotx.core.utils.toast
+import im.vector.app.R
+import im.vector.app.core.utils.toast
 import kotlinx.android.synthetic.debug.activity_test_material_theme.*
 
 // Rendering is not the same with VectorBaseActivity

vector/src/debug/java/im/vector/app/features/debug/DebugMaterialThemeDarkActivity.kt

@@ -14,6 +14,6 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.debug
+package im.vector.app.features.debug
 
 class DebugMaterialThemeDarkActivity : DebugMaterialThemeActivity()

vector/src/debug/java/im/vector/app/features/debug/DebugMaterialThemeLightActivity.kt

@@ -14,6 +14,6 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.debug
+package im.vector.app.features.debug
 
 class DebugMaterialThemeLightActivity : DebugMaterialThemeActivity()

vector/src/debug/java/im/vector/app/features/debug/DebugMenuActivity.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.debug
+package im.vector.app.features.debug
 
 import android.app.Activity
 import android.app.NotificationChannel
@@ -25,18 +25,18 @@ import android.os.Build
 import androidx.core.app.NotificationCompat
 import androidx.core.app.Person
 import butterknife.OnClick
+import im.vector.app.R
+import im.vector.app.core.di.ActiveSessionHolder
+import im.vector.app.core.di.ScreenComponent
+import im.vector.app.core.platform.VectorBaseActivity
+import im.vector.app.core.utils.PERMISSIONS_FOR_TAKING_PHOTO
+import im.vector.app.core.utils.PERMISSION_REQUEST_CODE_LAUNCH_CAMERA
+import im.vector.app.core.utils.allGranted
+import im.vector.app.core.utils.checkPermissions
+import im.vector.app.core.utils.toast
+import im.vector.app.features.debug.sas.DebugSasEmojiActivity
+import im.vector.app.features.qrcode.QrCodeScannerActivity
 import im.vector.matrix.android.internal.crypto.verification.qrcode.toQrCodeData
-import im.vector.riotx.R
-import im.vector.riotx.core.di.ActiveSessionHolder
-import im.vector.riotx.core.di.ScreenComponent
-import im.vector.riotx.core.platform.VectorBaseActivity
-import im.vector.riotx.core.utils.PERMISSIONS_FOR_TAKING_PHOTO
-import im.vector.riotx.core.utils.PERMISSION_REQUEST_CODE_LAUNCH_CAMERA
-import im.vector.riotx.core.utils.allGranted
-import im.vector.riotx.core.utils.checkPermissions
-import im.vector.riotx.core.utils.toast
-import im.vector.riotx.features.debug.sas.DebugSasEmojiActivity
-import im.vector.riotx.features.qrcode.QrCodeScannerActivity
 import kotlinx.android.synthetic.debug.activity_debug_menu.*
 import timber.log.Timber
 import javax.inject.Inject

vector/src/debug/java/im/vector/app/features/debug/TestLinkifyActivity.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.debug
+package im.vector.app.features.debug
 
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -25,7 +25,7 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.coordinatorlayout.widget.CoordinatorLayout
 import butterknife.BindView
 import butterknife.ButterKnife
-import im.vector.riotx.R
+import im.vector.app.R
 
 class TestLinkifyActivity : AppCompatActivity() {
 

vector/src/debug/java/im/vector/app/features/debug/sas/DebugSasEmojiActivity.kt

@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.debug.sas
+package im.vector.app.features.debug.sas
 
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
+import im.vector.app.R
+import im.vector.app.core.extensions.cleanup
+import im.vector.app.core.extensions.configureWith
 import im.vector.matrix.android.api.crypto.getAllVerificationEmojis
-import im.vector.riotx.R
-import im.vector.riotx.core.extensions.cleanup
-import im.vector.riotx.core.extensions.configureWith
 import kotlinx.android.synthetic.main.fragment_generic_recycler.*
 
 class DebugSasEmojiActivity : AppCompatActivity() {

vector/src/debug/java/im/vector/app/features/debug/sas/SasEmojiController.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.debug.sas
+package im.vector.app.features.debug.sas
 
 import com.airbnb.epoxy.TypedEpoxyController
 import im.vector.matrix.android.api.session.crypto.verification.EmojiRepresentation

vector/src/debug/java/im/vector/app/features/debug/sas/SasEmojiItem.kt

@@ -14,20 +14,20 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.debug.sas
+package im.vector.app.features.debug.sas
 
 import android.annotation.SuppressLint
 import android.widget.TextView
 import androidx.core.content.ContextCompat
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
+import im.vector.app.core.epoxy.VectorEpoxyHolder
+import im.vector.app.core.epoxy.VectorEpoxyModel
 import im.vector.matrix.android.api.session.crypto.verification.EmojiRepresentation
-import im.vector.riotx.core.epoxy.VectorEpoxyHolder
-import im.vector.riotx.core.epoxy.VectorEpoxyModel
 import me.gujun.android.span.image
 import me.gujun.android.span.span
 
-@EpoxyModelClass(layout = im.vector.riotx.R.layout.item_sas_emoji)
+@EpoxyModelClass(layout = im.vector.app.R.layout.item_sas_emoji)
 abstract class SasEmojiItem : VectorEpoxyModel<SasEmojiItem.Holder>() {
 
     @EpoxyAttribute
@@ -50,9 +50,9 @@ abstract class SasEmojiItem : VectorEpoxyModel<SasEmojiItem.Holder>() {
     }
 
     class Holder : VectorEpoxyHolder() {
-        val indexView by bind<TextView>(im.vector.riotx.R.id.sas_emoji_index)
-        val emojiView by bind<TextView>(im.vector.riotx.R.id.sas_emoji)
-        val textView by bind<TextView>(im.vector.riotx.R.id.sas_emoji_text)
-        val idView by bind<TextView>(im.vector.riotx.R.id.sas_emoji_text_id)
+        val indexView by bind<TextView>(im.vector.app.R.id.sas_emoji_index)
+        val emojiView by bind<TextView>(im.vector.app.R.id.sas_emoji)
+        val textView by bind<TextView>(im.vector.app.R.id.sas_emoji_text)
+        val idView by bind<TextView>(im.vector.app.R.id.sas_emoji_text_id)
     }
 }

vector/src/debug/java/im/vector/app/receivers/DebugReceiver.kt

@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.receivers
+package im.vector.app.receivers
 
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import android.content.IntentFilter
 import android.content.SharedPreferences
-import androidx.preference.PreferenceManager
 import androidx.core.content.edit
-import im.vector.riotx.core.utils.lsFiles
+import androidx.preference.PreferenceManager
+import im.vector.app.core.utils.lsFiles
 import timber.log.Timber
 
 /**

vector/src/debug/res/layout/activity_debug_menu.xml

@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="im.vector.riotx.features.debug.DebugMenuActivity"
+    tools:context=".features.debug.DebugMenuActivity"
     tools:ignore="HardcodedText">
 
     <ScrollView
@@ -68,7 +68,7 @@
                 android:layout_height="wrap_content"
                 android:text="Scan QR-code" />
 
-            <im.vector.riotx.core.ui.views.QrCodeImageView
+            <im.vector.app.core.ui.views.QrCodeImageView
                 android:id="@+id/debug_qr_code"
                 android:layout_width="200dp"
                 android:layout_height="200dp"

vector/src/debug/res/layout/activity_test_linkify.xml

@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/riot_secondary_text_color_status"
-    tools:context="im.vector.riotx.features.debug.TestLinkifyActivity">
+    tools:context=".features.debug.TestLinkifyActivity">
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"

vector/src/fdroid/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="im.vector.riotx">
+    package="im.vector.app">
 
     <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />

vector/src/fdroid/java/im/vector/app/FlavorCode.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx
+package im.vector.app
 
 import android.content.Context
 

vector/src/fdroid/java/im/vector/app/fdroid/features/settings/troubleshoot/TestAutoStartBoot.kt

@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.fdroid.features.settings.troubleshoot
+package im.vector.app.fdroid.features.settings.troubleshoot
 
-import im.vector.riotx.R
-import im.vector.riotx.core.resources.StringProvider
-import im.vector.riotx.features.settings.VectorPreferences
-import im.vector.riotx.features.settings.troubleshoot.TroubleshootTest
+import im.vector.app.R
+import im.vector.app.core.resources.StringProvider
+import im.vector.app.features.settings.VectorPreferences
+import im.vector.app.features.settings.troubleshoot.TroubleshootTest
 import javax.inject.Inject
 
 /**

vector/src/fdroid/java/im/vector/app/fdroid/features/settings/troubleshoot/TestBackgroundRestrictions.kt

@@ -13,15 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.fdroid.features.settings.troubleshoot
+package im.vector.app.fdroid.features.settings.troubleshoot
 
 import android.content.Context
 import android.net.ConnectivityManager
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.net.ConnectivityManagerCompat
-import im.vector.riotx.R
-import im.vector.riotx.core.resources.StringProvider
-import im.vector.riotx.features.settings.troubleshoot.TroubleshootTest
+import im.vector.app.R
+import im.vector.app.core.resources.StringProvider
+import im.vector.app.features.settings.troubleshoot.TroubleshootTest
 import javax.inject.Inject
 
 class TestBackgroundRestrictions @Inject constructor(private val context: AppCompatActivity,

vector/src/fdroid/java/im/vector/app/fdroid/features/settings/troubleshoot/TestBatteryOptimization.kt

@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.fdroid.features.settings.troubleshoot
+package im.vector.app.fdroid.features.settings.troubleshoot
 
 import androidx.fragment.app.Fragment
-import im.vector.riotx.R
-import im.vector.riotx.core.utils.isIgnoringBatteryOptimizations
-import im.vector.riotx.core.utils.requestDisablingBatteryOptimization
-import im.vector.riotx.features.settings.troubleshoot.NotificationTroubleshootTestManager
-import im.vector.riotx.features.settings.troubleshoot.TroubleshootTest
+import im.vector.app.R
+import im.vector.app.core.utils.isIgnoringBatteryOptimizations
+import im.vector.app.core.utils.requestDisablingBatteryOptimization
+import im.vector.app.features.settings.troubleshoot.NotificationTroubleshootTestManager
+import im.vector.app.features.settings.troubleshoot.TroubleshootTest
 
 // Not used anymore
 class TestBatteryOptimization(val fragment: Fragment) : TroubleshootTest(R.string.settings_troubleshoot_test_battery_title) {

vector/src/fdroid/java/im/vector/app/fdroid/package-info.kt

@@ -17,4 +17,4 @@
 /**
  * Code exclusively used by the FDroid build and not referenced on the main source code
  */
-package im.vector.riotx.fdroid
+package im.vector.app.fdroid

vector/src/fdroid/java/im/vector/app/fdroid/receiver/AlarmSyncBroadcastReceiver.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.fdroid.receiver
+package im.vector.app.fdroid.receiver
 
 import android.app.AlarmManager
 import android.app.PendingIntent
@@ -24,9 +24,9 @@ import android.content.Intent
 import android.os.Build
 import android.os.PowerManager
 import androidx.core.content.ContextCompat
+import im.vector.app.core.di.HasVectorInjector
+import im.vector.app.core.services.VectorSyncService
 import im.vector.matrix.android.internal.session.sync.job.SyncService
-import im.vector.riotx.core.di.HasVectorInjector
-import im.vector.riotx.core.services.VectorSyncService
 import timber.log.Timber
 
 class AlarmSyncBroadcastReceiver : BroadcastReceiver() {

vector/src/fdroid/java/im/vector/app/fdroid/receiver/OnApplicationUpgradeOrRebootReceiver.kt

@@ -15,12 +15,12 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.fdroid.receiver
+package im.vector.app.fdroid.receiver
 
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
-import im.vector.riotx.core.di.HasVectorInjector
+import im.vector.app.core.di.HasVectorInjector
 import timber.log.Timber
 
 class OnApplicationUpgradeOrRebootReceiver : BroadcastReceiver() {

vector/src/fdroid/java/im/vector/app/push/fcm/FcmHelper.kt

@@ -16,14 +16,14 @@
  */
 @file:Suppress("UNUSED_PARAMETER")
 
-package im.vector.riotx.push.fcm
+package im.vector.app.push.fcm
 
 import android.app.Activity
 import android.content.Context
-import im.vector.riotx.core.di.ActiveSessionHolder
-import im.vector.riotx.core.pushers.PushersManager
-import im.vector.riotx.fdroid.receiver.AlarmSyncBroadcastReceiver
-import im.vector.riotx.features.settings.VectorPreferences
+import im.vector.app.core.di.ActiveSessionHolder
+import im.vector.app.core.pushers.PushersManager
+import im.vector.app.fdroid.receiver.AlarmSyncBroadcastReceiver
+import im.vector.app.features.settings.VectorPreferences
 import timber.log.Timber
 
 /**

vector/src/fdroid/java/im/vector/app/push/fcm/NotificationTroubleshootTestManagerFactory.kt

@@ -13,16 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.push.fcm
+package im.vector.app.push.fcm
 
 import androidx.fragment.app.Fragment
-import im.vector.riotx.fdroid.features.settings.troubleshoot.TestAutoStartBoot
-import im.vector.riotx.fdroid.features.settings.troubleshoot.TestBackgroundRestrictions
-import im.vector.riotx.features.settings.troubleshoot.NotificationTroubleshootTestManager
-import im.vector.riotx.features.settings.troubleshoot.TestAccountSettings
-import im.vector.riotx.features.settings.troubleshoot.TestPushRulesSettings
-import im.vector.riotx.features.settings.troubleshoot.TestDeviceSettings
-import im.vector.riotx.features.settings.troubleshoot.TestSystemSettings
+import im.vector.app.fdroid.features.settings.troubleshoot.TestAutoStartBoot
+import im.vector.app.fdroid.features.settings.troubleshoot.TestBackgroundRestrictions
+import im.vector.app.features.settings.troubleshoot.NotificationTroubleshootTestManager
+import im.vector.app.features.settings.troubleshoot.TestAccountSettings
+import im.vector.app.features.settings.troubleshoot.TestDeviceSettings
+import im.vector.app.features.settings.troubleshoot.TestPushRulesSettings
+import im.vector.app.features.settings.troubleshoot.TestSystemSettings
 import javax.inject.Inject
 
 class NotificationTroubleshootTestManagerFactory @Inject constructor(private val testSystemSettings: TestSystemSettings,

vector/src/gplay/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="im.vector.riotx">
+    package="im.vector.app">
 
     <application>
 

vector/src/gplay/java/im/vector/app/FlavorCode.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx
+package im.vector.app
 
 import android.content.Context
 import android.content.Intent

vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestFirebaseToken.kt

@@ -13,16 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.gplay.features.settings.troubleshoot
+package im.vector.app.gplay.features.settings.troubleshoot
 
 import androidx.appcompat.app.AppCompatActivity
 import com.google.firebase.iid.FirebaseInstanceId
-import im.vector.riotx.R
-import im.vector.riotx.core.resources.StringProvider
-import im.vector.riotx.core.utils.startAddGoogleAccountIntent
-import im.vector.riotx.features.settings.troubleshoot.NotificationTroubleshootTestManager
-import im.vector.riotx.features.settings.troubleshoot.TroubleshootTest
-import im.vector.riotx.push.fcm.FcmHelper
+import im.vector.app.R
+import im.vector.app.core.resources.StringProvider
+import im.vector.app.core.utils.startAddGoogleAccountIntent
+import im.vector.app.features.settings.troubleshoot.NotificationTroubleshootTestManager
+import im.vector.app.features.settings.troubleshoot.TroubleshootTest
+import im.vector.app.push.fcm.FcmHelper
 import timber.log.Timber
 import javax.inject.Inject
 

vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestPlayServices.kt

@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.gplay.features.settings.troubleshoot
+package im.vector.app.gplay.features.settings.troubleshoot
 
 import androidx.appcompat.app.AppCompatActivity
 import com.google.android.gms.common.ConnectionResult
 import com.google.android.gms.common.GoogleApiAvailability
-import im.vector.riotx.R
-import im.vector.riotx.core.resources.StringProvider
-import im.vector.riotx.features.settings.troubleshoot.TroubleshootTest
+import im.vector.app.R
+import im.vector.app.core.resources.StringProvider
+import im.vector.app.features.settings.troubleshoot.TroubleshootTest
 import timber.log.Timber
 import javax.inject.Inject
 

vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestTokenRegistration.kt

@@ -13,19 +13,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.gplay.features.settings.troubleshoot
+package im.vector.app.gplay.features.settings.troubleshoot
 
 import androidx.appcompat.app.AppCompatActivity
 import androidx.lifecycle.Observer
 import androidx.work.WorkInfo
 import androidx.work.WorkManager
 import im.vector.matrix.android.api.session.pushers.PusherState
-import im.vector.riotx.R
-import im.vector.riotx.core.di.ActiveSessionHolder
-import im.vector.riotx.core.pushers.PushersManager
-import im.vector.riotx.core.resources.StringProvider
-import im.vector.riotx.features.settings.troubleshoot.TroubleshootTest
-import im.vector.riotx.push.fcm.FcmHelper
+import im.vector.app.R
+import im.vector.app.core.di.ActiveSessionHolder
+import im.vector.app.core.pushers.PushersManager
+import im.vector.app.core.resources.StringProvider
+import im.vector.app.features.settings.troubleshoot.TroubleshootTest
+import im.vector.app.push.fcm.FcmHelper
 import javax.inject.Inject
 
 /**

vector/src/gplay/java/im/vector/app/gplay/package-info.kt

@@ -17,4 +17,4 @@
 /**
  * Code exclusively used by the GPlay build and not referenced on the main source code
  */
-package im.vector.riotx.gplay
+package im.vector.app.gplay

vector/src/gplay/java/im/vector/app/gplay/push/fcm/VectorFirebaseMessagingService.kt

@@ -17,7 +17,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.gplay.push.fcm
+package im.vector.app.gplay.push.fcm
 
 import android.os.Handler
 import android.os.Looper
@@ -28,18 +28,18 @@ import com.google.firebase.messaging.RemoteMessage
 import im.vector.matrix.android.api.pushrules.rest.PushRule
 import im.vector.matrix.android.api.session.Session
 import im.vector.matrix.android.api.session.events.model.Event
-import im.vector.riotx.BuildConfig
-import im.vector.riotx.R
-import im.vector.riotx.core.di.ActiveSessionHolder
-import im.vector.riotx.core.extensions.vectorComponent
-import im.vector.riotx.core.pushers.PushersManager
-import im.vector.riotx.features.badge.BadgeProxy
-import im.vector.riotx.features.notifications.NotifiableEventResolver
-import im.vector.riotx.features.notifications.NotifiableMessageEvent
-import im.vector.riotx.features.notifications.NotificationDrawerManager
-import im.vector.riotx.features.notifications.SimpleNotifiableEvent
-import im.vector.riotx.features.settings.VectorPreferences
-import im.vector.riotx.push.fcm.FcmHelper
+import im.vector.app.BuildConfig
+import im.vector.app.R
+import im.vector.app.core.di.ActiveSessionHolder
+import im.vector.app.core.extensions.vectorComponent
+import im.vector.app.core.pushers.PushersManager
+import im.vector.app.features.badge.BadgeProxy
+import im.vector.app.features.notifications.NotifiableEventResolver
+import im.vector.app.features.notifications.NotifiableMessageEvent
+import im.vector.app.features.notifications.NotificationDrawerManager
+import im.vector.app.features.notifications.SimpleNotifiableEvent
+import im.vector.app.features.settings.VectorPreferences
+import im.vector.app.push.fcm.FcmHelper
 import timber.log.Timber
 
 /**

vector/src/gplay/java/im/vector/app/push/fcm/FcmHelper.kt

@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.push.fcm
+package im.vector.app.push.fcm
 
 import android.app.Activity
 import android.content.Context
@@ -25,10 +25,10 @@ import androidx.core.content.edit
 import com.google.android.gms.common.ConnectionResult
 import com.google.android.gms.common.GoogleApiAvailability
 import com.google.firebase.iid.FirebaseInstanceId
-import im.vector.riotx.R
-import im.vector.riotx.core.di.ActiveSessionHolder
-import im.vector.riotx.core.pushers.PushersManager
-import im.vector.riotx.features.settings.VectorPreferences
+import im.vector.app.R
+import im.vector.app.core.di.ActiveSessionHolder
+import im.vector.app.core.pushers.PushersManager
+import im.vector.app.features.settings.VectorPreferences
 import timber.log.Timber
 
 /**

vector/src/gplay/java/im/vector/app/push/fcm/NotificationTroubleshootTestManagerFactory.kt

@@ -13,17 +13,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx.push.fcm
+package im.vector.app.push.fcm
 
 import androidx.fragment.app.Fragment
-import im.vector.riotx.features.settings.troubleshoot.NotificationTroubleshootTestManager
-import im.vector.riotx.features.settings.troubleshoot.TestAccountSettings
-import im.vector.riotx.features.settings.troubleshoot.TestDeviceSettings
-import im.vector.riotx.features.settings.troubleshoot.TestPushRulesSettings
-import im.vector.riotx.features.settings.troubleshoot.TestSystemSettings
-import im.vector.riotx.gplay.features.settings.troubleshoot.TestFirebaseToken
-import im.vector.riotx.gplay.features.settings.troubleshoot.TestPlayServices
-import im.vector.riotx.gplay.features.settings.troubleshoot.TestTokenRegistration
+import im.vector.app.features.settings.troubleshoot.NotificationTroubleshootTestManager
+import im.vector.app.features.settings.troubleshoot.TestAccountSettings
+import im.vector.app.features.settings.troubleshoot.TestDeviceSettings
+import im.vector.app.features.settings.troubleshoot.TestPushRulesSettings
+import im.vector.app.features.settings.troubleshoot.TestSystemSettings
+import im.vector.app.gplay.features.settings.troubleshoot.TestFirebaseToken
+import im.vector.app.gplay.features.settings.troubleshoot.TestPlayServices
+import im.vector.app.gplay.features.settings.troubleshoot.TestTokenRegistration
 import javax.inject.Inject
 
 class NotificationTroubleshootTestManagerFactory @Inject constructor(private val testSystemSettings: TestSystemSettings,

vector/src/main/AndroidManifest.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="im.vector.riotx">
+    package="im.vector.app">
 
     <!-- Needed for VOIP call to detect and switch to headset-->
     <uses-permission android:name="android.permission.BLUETOOTH" />
@@ -38,7 +38,7 @@
         android:required="false" />
 
     <application
-        android:name=".VectorApplication"
+        android:name="im.vector.app.VectorApplication"
         android:allowBackup="false"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
@@ -54,13 +54,13 @@
             android:value="9.9" />
 
         <activity
-            android:name=".features.MainActivity"
+            android:name="im.vector.app.features.MainActivity"
             android:theme="@style/AppTheme.Launcher" />
 
         <!-- Activity alias for the launcher Activity (must be declared after the Activity it targets) -->
         <activity-alias
             android:name=".features.Alias"
-            android:targetActivity=".features.MainActivity">
+            android:targetActivity="im.vector.app.features.MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -68,9 +68,9 @@
             </intent-filter>
         </activity-alias>
 
-        <activity android:name=".features.home.HomeActivity" />
+        <activity android:name="im.vector.app.features.home.HomeActivity" />
         <activity
-            android:name=".features.login.LoginActivity"
+            android:name="im.vector.app.features.login.LoginActivity"
             android:launchMode="singleTask"
             android:windowSoftInputMode="adjustResize">
             <!-- Add intent filter to handle redirection URL after SSO login in external browser -->
@@ -84,50 +84,50 @@
                 <data android:host="element" />
             </intent-filter>
         </activity>
-        <activity android:name=".features.media.ImageMediaViewerActivity" />
+        <activity android:name="im.vector.app.features.media.ImageMediaViewerActivity" />
 
         <activity
-            android:name=".features.media.VectorAttachmentViewerActivity"
+            android:name="im.vector.app.features.media.VectorAttachmentViewerActivity"
             android:theme="@style/AppTheme.Transparent" />
 
-        <activity android:name=".features.media.BigImageViewerActivity" />
+        <activity android:name="im.vector.app.features.media.BigImageViewerActivity" />
         <activity
-            android:name=".features.rageshake.BugReportActivity"
+            android:name="im.vector.app.features.rageshake.BugReportActivity"
             android:label="@string/title_activity_bug_report" />
         <activity
-            android:name=".features.settings.VectorSettingsActivity"
+            android:name="im.vector.app.features.settings.VectorSettingsActivity"
             android:label="@string/title_activity_settings"
             android:windowSoftInputMode="adjustResize" />
-        <activity android:name=".features.media.VideoMediaViewerActivity" />
+        <activity android:name="im.vector.app.features.media.VideoMediaViewerActivity" />
         <activity
-            android:name=".features.crypto.keysbackup.restore.KeysBackupRestoreActivity"
+            android:name="im.vector.app.features.crypto.keysbackup.restore.KeysBackupRestoreActivity"
             android:label="@string/title_activity_keys_backup_setup" />
         <activity
-            android:name=".features.crypto.keysbackup.setup.KeysBackupSetupActivity"
+            android:name="im.vector.app.features.crypto.keysbackup.setup.KeysBackupSetupActivity"
             android:label="@string/title_activity_keys_backup_restore" />
         <activity
-            android:name=".features.crypto.keysbackup.settings.KeysBackupManageActivity"
+            android:name="im.vector.app.features.crypto.keysbackup.settings.KeysBackupManageActivity"
             android:label="@string/encryption_message_recovery" />
 
         <activity
-            android:name=".features.reactions.EmojiReactionPickerActivity"
+            android:name="im.vector.app.features.reactions.EmojiReactionPickerActivity"
             android:label="@string/title_activity_emoji_reaction_picker" />
-        <activity android:name=".features.roomdirectory.createroom.CreateRoomActivity" />
-        <activity android:name=".features.roomdirectory.RoomDirectoryActivity" />
-        <activity android:name=".features.roomdirectory.roompreview.RoomPreviewActivity" />
-        <activity android:name=".features.home.room.filtered.FilteredRoomsActivity" />
+        <activity android:name="im.vector.app.features.roomdirectory.createroom.CreateRoomActivity" />
+        <activity android:name="im.vector.app.features.roomdirectory.RoomDirectoryActivity" />
+        <activity android:name="im.vector.app.features.roomdirectory.roompreview.RoomPreviewActivity" />
+        <activity android:name="im.vector.app.features.home.room.filtered.FilteredRoomsActivity" />
         <activity
-            android:name=".features.home.room.detail.RoomDetailActivity"
-            android:parentActivityName=".features.home.HomeActivity">
+            android:name="im.vector.app.features.home.room.detail.RoomDetailActivity"
+            android:parentActivityName="im.vector.app.features.home.HomeActivity">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
-                android:value=".features.home.HomeActivity" />
+                android:value="im.vector.app.features.home.HomeActivity" />
         </activity>
-        <activity android:name=".features.debug.DebugMenuActivity" />
-        <activity android:name="im.vector.riotx.features.createdirect.CreateDirectRoomActivity" />
-        <activity android:name="im.vector.riotx.features.invite.InviteUsersToRoomActivity" />
-        <activity android:name=".features.webview.VectorWebViewActivity" />
-        <activity android:name=".features.link.LinkHandlerActivity">
+        <activity android:name="im.vector.app.features.debug.DebugMenuActivity" />
+        <activity android:name="im.vector.app.features.createdirect.CreateDirectRoomActivity" />
+        <activity android:name="im.vector.app.features.invite.InviteUsersToRoomActivity" />
+        <activity android:name="im.vector.app.features.webview.VectorWebViewActivity" />
+        <activity android:name="im.vector.app.features.link.LinkHandlerActivity">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
 
@@ -142,11 +142,11 @@
         </activity>
 
         <activity
-            android:name=".features.share.IncomingShareActivity"
-            android:parentActivityName=".features.home.HomeActivity">
+            android:name="im.vector.app.features.share.IncomingShareActivity"
+            android:parentActivityName="im.vector.app.features.home.HomeActivity">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
-                android:value=".features.home.HomeActivity" />
+                android:value="im.vector.app.features.home.HomeActivity" />
 
             <intent-filter>
                 <action android:name="android.intent.action.SEND" />
@@ -164,13 +164,13 @@
             </intent-filter>
         </activity>
 
-        <activity android:name=".features.roomprofile.RoomProfileActivity" />
+        <activity android:name="im.vector.app.features.roomprofile.RoomProfileActivity" />
 
-        <activity android:name=".features.signout.hard.SignedOutActivity" />
+        <activity android:name="im.vector.app.features.signout.hard.SignedOutActivity" />
         <activity
-            android:name=".features.signout.soft.SoftLogoutActivity"
+            android:name="im.vector.app.features.signout.soft.SoftLogoutActivity"
             android:windowSoftInputMode="adjustResize" />
-        <activity android:name=".features.permalink.PermalinkHandlerActivity">
+        <activity android:name="im.vector.app.features.permalink.PermalinkHandlerActivity">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
 
@@ -184,33 +184,33 @@
         </activity>
 
         <activity
-            android:name=".features.roommemberprofile.RoomMemberProfileActivity"
-            android:parentActivityName=".features.home.HomeActivity">
+            android:name="im.vector.app.features.roommemberprofile.RoomMemberProfileActivity"
+            android:parentActivityName="im.vector.app.features.home.HomeActivity">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
-                android:value=".features.home.HomeActivity" />
+                android:value="im.vector.app.features.home.HomeActivity" />
         </activity>
 
-        <activity android:name=".features.qrcode.QrCodeScannerActivity" />
+        <activity android:name="im.vector.app.features.qrcode.QrCodeScannerActivity" />
 
-        <activity android:name=".features.crypto.quads.SharedSecureStorageActivity" />
+        <activity android:name="im.vector.app.features.crypto.quads.SharedSecureStorageActivity" />
         <activity
             android:name="com.yalantis.ucrop.UCropActivity"
             android:screenOrientation="portrait" />
 
         <activity
-            android:name=".features.attachments.preview.AttachmentsPreviewActivity"
+            android:name="im.vector.app.features.attachments.preview.AttachmentsPreviewActivity"
             android:theme="@style/AppTheme.AttachmentsPreview" />
-        <activity android:name=".features.call.VectorCallActivity" />
+        <activity android:name="im.vector.app.features.call.VectorCallActivity" />
 
-        <activity android:name=".features.terms.ReviewTermsActivity" />
-        <activity android:name=".features.widgets.WidgetActivity" />
-        <activity android:name=".features.pin.PinActivity" />
+        <activity android:name="im.vector.app.features.terms.ReviewTermsActivity" />
+        <activity android:name="im.vector.app.features.widgets.WidgetActivity" />
+        <activity android:name="im.vector.app.features.pin.PinActivity" />
 
         <!-- Services -->
 
         <service
-            android:name=".core.services.CallService"
+            android:name="im.vector.app.core.services.CallService"
             android:exported="false">
             <!-- in order to get headset button events -->
             <intent-filter>
@@ -219,11 +219,11 @@
         </service>
 
         <service
-            android:name=".core.services.VectorSyncService"
+            android:name="im.vector.app.core.services.VectorSyncService"
             android:exported="false" />
 
         <service
-            android:name=".features.call.telecom.VectorConnectionService"
+            android:name="im.vector.app.features.call.telecom.VectorConnectionService"
             android:permission="android.permission.BIND_TELECOM_CONNECTION_SERVICE">
             <intent-filter>
                 <action android:name="android.telecom.ConnectionService" />
@@ -233,12 +233,12 @@
         <!-- Receivers -->
 
         <receiver
-            android:name=".features.call.service.CallHeadsUpActionReceiver"
+            android:name="im.vector.app.features.call.service.CallHeadsUpActionReceiver"
             android:exported="false" />
 
         <!-- Exported false, should only be accessible from this app!! -->
         <receiver
-            android:name=".features.notifications.NotificationBroadcastReceiver"
+            android:name="im.vector.app.features.notifications.NotificationBroadcastReceiver"
             android:enabled="true"
             android:exported="false" />
 

vector/src/main/java/im/vector/app/ActiveSessionDataSource.kt

@@ -15,11 +15,11 @@
  *
  */
 
-package im.vector.riotx
+package im.vector.app
 
 import arrow.core.Option
 import im.vector.matrix.android.api.session.Session
-import im.vector.riotx.core.utils.BehaviorDataSource
+import im.vector.app.core.utils.BehaviorDataSource
 import javax.inject.Inject
 import javax.inject.Singleton
 

vector/src/main/java/im/vector/app/AppStateHandler.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx
+package im.vector.app
 
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleObserver
@@ -24,10 +24,10 @@ import im.vector.matrix.android.api.session.group.model.GroupSummary
 import im.vector.matrix.android.api.session.room.model.RoomSummary
 import im.vector.matrix.android.api.session.room.roomSummaryQueryParams
 import im.vector.matrix.rx.rx
-import im.vector.riotx.features.grouplist.ALL_COMMUNITIES_GROUP_ID
-import im.vector.riotx.features.grouplist.SelectedGroupDataSource
-import im.vector.riotx.features.home.HomeRoomListDataSource
-import im.vector.riotx.features.home.room.list.ChronologicalRoomComparator
+import im.vector.app.features.grouplist.ALL_COMMUNITIES_GROUP_ID
+import im.vector.app.features.grouplist.SelectedGroupDataSource
+import im.vector.app.features.home.HomeRoomListDataSource
+import im.vector.app.features.home.room.list.ChronologicalRoomComparator
 import io.reactivex.Observable
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.disposables.CompositeDisposable

vector/src/main/java/im/vector/app/EmojiCompatFontProvider.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx
+package im.vector.app
 
 import android.graphics.Typeface
 import androidx.core.provider.FontsContractCompat

vector/src/main/java/im/vector/app/EmojiCompatWrapper.kt

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotx
+package im.vector.app
 
 import android.content.Context
 import androidx.core.provider.FontRequest

vector/src/main/java/im/vector/app/VectorApplication.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx
+package im.vector.app
 
 import android.app.Application
 import android.content.Context
@@ -36,23 +36,23 @@ import im.vector.matrix.android.api.Matrix
 import im.vector.matrix.android.api.MatrixConfiguration
 import im.vector.matrix.android.api.auth.AuthenticationService
 import im.vector.matrix.android.api.legacy.LegacySessionImporter
-import im.vector.riotx.core.di.ActiveSessionHolder
-import im.vector.riotx.core.di.DaggerVectorComponent
-import im.vector.riotx.core.di.HasVectorInjector
-import im.vector.riotx.core.di.VectorComponent
-import im.vector.riotx.core.extensions.configureAndStart
-import im.vector.riotx.core.rx.RxConfig
-import im.vector.riotx.features.configuration.VectorConfiguration
-import im.vector.riotx.features.disclaimer.doNotShowDisclaimerDialog
-import im.vector.riotx.features.lifecycle.VectorActivityLifecycleCallbacks
-import im.vector.riotx.features.notifications.NotificationDrawerManager
-import im.vector.riotx.features.notifications.NotificationUtils
-import im.vector.riotx.features.pin.PinLocker
-import im.vector.riotx.features.popup.PopupAlertManager
-import im.vector.riotx.features.rageshake.VectorUncaughtExceptionHandler
-import im.vector.riotx.features.settings.VectorPreferences
-import im.vector.riotx.features.version.VersionProvider
-import im.vector.riotx.push.fcm.FcmHelper
+import im.vector.app.core.di.ActiveSessionHolder
+import im.vector.app.core.di.DaggerVectorComponent
+import im.vector.app.core.di.HasVectorInjector
+import im.vector.app.core.di.VectorComponent
+import im.vector.app.core.extensions.configureAndStart
+import im.vector.app.core.rx.RxConfig
+import im.vector.app.features.configuration.VectorConfiguration
+import im.vector.app.features.disclaimer.doNotShowDisclaimerDialog
+import im.vector.app.features.lifecycle.VectorActivityLifecycleCallbacks
+import im.vector.app.features.notifications.NotificationDrawerManager
+import im.vector.app.features.notifications.NotificationUtils
+import im.vector.app.features.pin.PinLocker
+import im.vector.app.features.popup.PopupAlertManager
+import im.vector.app.features.rageshake.VectorUncaughtExceptionHandler
+import im.vector.app.features.settings.VectorPreferences
+import im.vector.app.features.version.VersionProvider
+import im.vector.app.push.fcm.FcmHelper
 import timber.log.Timber
 import java.text.SimpleDateFormat
 import java.util.Date

vector/src/main/java/im/vector/app/core/animations/AppBarStateChangeListener.kt

@@ -15,7 +15,7 @@
  *
  */
 
-package im.vector.riotx.core.animations
+package im.vector.app.core.animations
 
 import com.google.android.material.appbar.AppBarLayout
 import com.google.android.material.appbar.AppBarLayout.OnOffsetChangedListener

vector/src/main/java/im/vector/app/core/animations/Constants.kt

@@ -14,6 +14,6 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.animations
+package im.vector.app.core.animations
 
 const val ANIMATION_DURATION_SHORT = 200L

vector/src/main/java/im/vector/app/core/animations/MatrixItemAppBarStateChangeListener.kt

@@ -15,7 +15,7 @@
  *
  */
 
-package im.vector.riotx.core.animations
+package im.vector.app.core.animations
 
 import android.view.View
 import com.google.android.material.appbar.AppBarLayout

vector/src/main/java/im/vector/app/core/animations/SimpleAnimatorListener.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.animations
+package im.vector.app.core.animations
 
 import android.animation.Animator
 

vector/src/main/java/im/vector/app/core/animations/SimpleTransitionListener.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.animations
+package im.vector.app.core.animations
 
 import androidx.transition.Transition
 

vector/src/main/java/im/vector/app/core/animations/VectorFullTransitionSet.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.animations
+package im.vector.app.core.animations
 
 import android.content.Context
 import android.util.AttributeSet

vector/src/main/java/im/vector/app/core/animations/behavior/PercentViewBehavior.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.animations.behavior
+package im.vector.app.core.animations.behavior
 
 import android.animation.ArgbEvaluator
 import android.content.Context
@@ -24,7 +24,7 @@ import android.view.View
 import androidx.coordinatorlayout.widget.CoordinatorLayout
 import androidx.core.content.withStyledAttributes
 
-import im.vector.riotx.R
+import im.vector.app.R
 import kotlin.math.abs
 
 private const val UNSPECIFIED_INT = Integer.MAX_VALUE

vector/src/main/java/im/vector/app/core/contacts/ContactsDataSource.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.contacts
+package im.vector.app.core.contacts
 
 import android.content.Context
 import android.database.Cursor

vector/src/main/java/im/vector/app/core/contacts/MappedContact.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.contacts
+package im.vector.app.core.contacts
 
 import android.net.Uri
 

vector/src/main/java/im/vector/app/core/date/VectorDateFormatter.kt

@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.date
+package im.vector.app.core.date
 
 import android.content.Context
 import android.text.format.DateUtils
-import im.vector.riotx.core.resources.LocaleProvider
+import im.vector.app.core.resources.LocaleProvider
 import org.threeten.bp.LocalDateTime
 import org.threeten.bp.format.DateTimeFormatter
 import javax.inject.Inject

vector/src/main/java/im/vector/app/core/di/ActiveSessionHolder.kt

@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.di
+package im.vector.app.core.di
 
 import arrow.core.Option
+import im.vector.app.ActiveSessionDataSource
+import im.vector.app.features.call.WebRtcPeerConnectionManager
+import im.vector.app.features.crypto.keysrequest.KeyRequestHandler
+import im.vector.app.features.crypto.verification.IncomingVerificationRequestHandler
+import im.vector.app.features.notifications.PushRuleTriggerListener
+import im.vector.app.features.session.SessionListener
 import im.vector.matrix.android.api.auth.AuthenticationService
 import im.vector.matrix.android.api.session.Session
-import im.vector.riotx.ActiveSessionDataSource
-import im.vector.riotx.features.call.WebRtcPeerConnectionManager
-import im.vector.riotx.features.crypto.keysrequest.KeyRequestHandler
-import im.vector.riotx.features.crypto.verification.IncomingVerificationRequestHandler
-import im.vector.riotx.features.notifications.PushRuleTriggerListener
-import im.vector.riotx.features.session.SessionListener
 import timber.log.Timber
 import java.util.concurrent.atomic.AtomicReference
 import javax.inject.Inject

vector/src/main/java/im/vector/app/core/di/AssistedInjectModule.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.core.di
+package im.vector.app.core.di
 
 import com.squareup.inject.assisted.dagger2.AssistedModule
 import dagger.Module

vector/src/main/java/im/vector/app/core/di/FragmentKey.kt

@@ -15,7 +15,7 @@
  *
  */
 
-package im.vector.riotx.core.di
+package im.vector.app.core.di
 
 import androidx.fragment.app.Fragment
 import dagger.MapKey

vector/src/main/java/im/vector/app/core/di/FragmentModule.kt

@@ -15,99 +15,99 @@
  *
  */
 
-package im.vector.riotx.core.di
+package im.vector.app.core.di
 
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentFactory
 import dagger.Binds
 import dagger.Module
 import dagger.multibindings.IntoMap
-import im.vector.riotx.features.attachments.preview.AttachmentsPreviewFragment
-import im.vector.riotx.features.contactsbook.ContactsBookFragment
-import im.vector.riotx.features.crypto.keysbackup.settings.KeysBackupSettingsFragment
-import im.vector.riotx.features.crypto.quads.SharedSecuredStorageKeyFragment
-import im.vector.riotx.features.crypto.quads.SharedSecuredStoragePassphraseFragment
-import im.vector.riotx.features.crypto.recover.BootstrapAccountPasswordFragment
-import im.vector.riotx.features.crypto.recover.BootstrapConclusionFragment
-import im.vector.riotx.features.crypto.recover.BootstrapConfirmPassphraseFragment
-import im.vector.riotx.features.crypto.recover.BootstrapEnterPassphraseFragment
-import im.vector.riotx.features.crypto.recover.BootstrapMigrateBackupFragment
-import im.vector.riotx.features.crypto.recover.BootstrapSaveRecoveryKeyFragment
-import im.vector.riotx.features.crypto.recover.BootstrapSetupRecoveryKeyFragment
-import im.vector.riotx.features.crypto.recover.BootstrapWaitingFragment
-import im.vector.riotx.features.crypto.verification.cancel.VerificationCancelFragment
-import im.vector.riotx.features.crypto.verification.cancel.VerificationNotMeFragment
-import im.vector.riotx.features.crypto.verification.choose.VerificationChooseMethodFragment
-import im.vector.riotx.features.crypto.verification.conclusion.VerificationConclusionFragment
-import im.vector.riotx.features.crypto.verification.emoji.VerificationEmojiCodeFragment
-import im.vector.riotx.features.crypto.verification.qrconfirmation.VerificationQRWaitingFragment
-import im.vector.riotx.features.crypto.verification.qrconfirmation.VerificationQrScannedByOtherFragment
-import im.vector.riotx.features.crypto.verification.request.VerificationRequestFragment
-import im.vector.riotx.features.discovery.DiscoverySettingsFragment
-import im.vector.riotx.features.discovery.change.SetIdentityServerFragment
-import im.vector.riotx.features.grouplist.GroupListFragment
-import im.vector.riotx.features.home.HomeDetailFragment
-import im.vector.riotx.features.home.HomeDrawerFragment
-import im.vector.riotx.features.home.LoadingFragment
-import im.vector.riotx.features.home.room.breadcrumbs.BreadcrumbsFragment
-import im.vector.riotx.features.home.room.detail.RoomDetailFragment
-import im.vector.riotx.features.home.room.list.RoomListFragment
-import im.vector.riotx.features.login.LoginCaptchaFragment
-import im.vector.riotx.features.login.LoginFragment
-import im.vector.riotx.features.login.LoginGenericTextInputFormFragment
-import im.vector.riotx.features.login.LoginResetPasswordFragment
-import im.vector.riotx.features.login.LoginResetPasswordMailConfirmationFragment
-import im.vector.riotx.features.login.LoginResetPasswordSuccessFragment
-import im.vector.riotx.features.login.LoginServerSelectionFragment
-import im.vector.riotx.features.login.LoginServerUrlFormFragment
-import im.vector.riotx.features.login.LoginSignUpSignInSelectionFragment
-import im.vector.riotx.features.login.LoginSignUpSignInSsoFragment
-import im.vector.riotx.features.login.LoginSplashFragment
-import im.vector.riotx.features.login.LoginWaitForEmailFragment
-import im.vector.riotx.features.login.LoginWebFragment
-import im.vector.riotx.features.login.terms.LoginTermsFragment
-import im.vector.riotx.features.pin.PinFragment
-import im.vector.riotx.features.qrcode.QrCodeScannerFragment
-import im.vector.riotx.features.reactions.EmojiChooserFragment
-import im.vector.riotx.features.reactions.EmojiSearchResultFragment
-import im.vector.riotx.features.roomdirectory.PublicRoomsFragment
-import im.vector.riotx.features.roomdirectory.createroom.CreateRoomFragment
-import im.vector.riotx.features.roomdirectory.picker.RoomDirectoryPickerFragment
-import im.vector.riotx.features.roomdirectory.roompreview.RoomPreviewNoPreviewFragment
-import im.vector.riotx.features.roommemberprofile.RoomMemberProfileFragment
-import im.vector.riotx.features.roommemberprofile.devices.DeviceListFragment
-import im.vector.riotx.features.roommemberprofile.devices.DeviceTrustInfoActionFragment
-import im.vector.riotx.features.roomprofile.RoomProfileFragment
-import im.vector.riotx.features.roomprofile.banned.RoomBannedMemberListFragment
-import im.vector.riotx.features.roomprofile.members.RoomMemberListFragment
-import im.vector.riotx.features.roomprofile.settings.RoomSettingsFragment
-import im.vector.riotx.features.roomprofile.uploads.RoomUploadsFragment
-import im.vector.riotx.features.roomprofile.uploads.files.RoomUploadsFilesFragment
-import im.vector.riotx.features.roomprofile.uploads.media.RoomUploadsMediaFragment
-import im.vector.riotx.features.settings.VectorSettingsAdvancedNotificationPreferenceFragment
-import im.vector.riotx.features.settings.VectorSettingsHelpAboutFragment
-import im.vector.riotx.features.settings.VectorSettingsLabsFragment
-import im.vector.riotx.features.settings.VectorSettingsNotificationPreferenceFragment
-import im.vector.riotx.features.settings.VectorSettingsNotificationsTroubleshootFragment
-import im.vector.riotx.features.settings.VectorSettingsPreferencesFragment
-import im.vector.riotx.features.settings.VectorSettingsSecurityPrivacyFragment
-import im.vector.riotx.features.settings.account.deactivation.DeactivateAccountFragment
-import im.vector.riotx.features.settings.crosssigning.CrossSigningSettingsFragment
-import im.vector.riotx.features.settings.devices.VectorSettingsDevicesFragment
-import im.vector.riotx.features.settings.devtools.AccountDataFragment
-import im.vector.riotx.features.settings.devtools.GossipingEventsPaperTrailFragment
-import im.vector.riotx.features.settings.devtools.IncomingKeyRequestListFragment
-import im.vector.riotx.features.settings.devtools.KeyRequestsFragment
-import im.vector.riotx.features.settings.devtools.OutgoingKeyRequestListFragment
-import im.vector.riotx.features.settings.ignored.VectorSettingsIgnoredUsersFragment
-import im.vector.riotx.features.settings.locale.LocalePickerFragment
-import im.vector.riotx.features.settings.push.PushGatewaysFragment
-import im.vector.riotx.features.share.IncomingShareFragment
-import im.vector.riotx.features.signout.soft.SoftLogoutFragment
-import im.vector.riotx.features.terms.ReviewTermsFragment
-import im.vector.riotx.features.userdirectory.KnownUsersFragment
-import im.vector.riotx.features.userdirectory.UserDirectoryFragment
-import im.vector.riotx.features.widgets.WidgetFragment
+import im.vector.app.features.attachments.preview.AttachmentsPreviewFragment
+import im.vector.app.features.contactsbook.ContactsBookFragment
+import im.vector.app.features.crypto.keysbackup.settings.KeysBackupSettingsFragment
+import im.vector.app.features.crypto.quads.SharedSecuredStorageKeyFragment
+import im.vector.app.features.crypto.quads.SharedSecuredStoragePassphraseFragment
+import im.vector.app.features.crypto.recover.BootstrapAccountPasswordFragment
+import im.vector.app.features.crypto.recover.BootstrapConclusionFragment
+import im.vector.app.features.crypto.recover.BootstrapConfirmPassphraseFragment
+import im.vector.app.features.crypto.recover.BootstrapEnterPassphraseFragment
+import im.vector.app.features.crypto.recover.BootstrapMigrateBackupFragment
+import im.vector.app.features.crypto.recover.BootstrapSaveRecoveryKeyFragment
+import im.vector.app.features.crypto.recover.BootstrapSetupRecoveryKeyFragment
+import im.vector.app.features.crypto.recover.BootstrapWaitingFragment
+import im.vector.app.features.crypto.verification.cancel.VerificationCancelFragment
+import im.vector.app.features.crypto.verification.cancel.VerificationNotMeFragment
+import im.vector.app.features.crypto.verification.choose.VerificationChooseMethodFragment
+import im.vector.app.features.crypto.verification.conclusion.VerificationConclusionFragment
+import im.vector.app.features.crypto.verification.emoji.VerificationEmojiCodeFragment
+import im.vector.app.features.crypto.verification.qrconfirmation.VerificationQRWaitingFragment
+import im.vector.app.features.crypto.verification.qrconfirmation.VerificationQrScannedByOtherFragment
+import im.vector.app.features.crypto.verification.request.VerificationRequestFragment
+import im.vector.app.features.discovery.DiscoverySettingsFragment
+import im.vector.app.features.discovery.change.SetIdentityServerFragment
+import im.vector.app.features.grouplist.GroupListFragment
+import im.vector.app.features.home.HomeDetailFragment
+import im.vector.app.features.home.HomeDrawerFragment
+import im.vector.app.features.home.LoadingFragment
+import im.vector.app.features.home.room.breadcrumbs.BreadcrumbsFragment
+import im.vector.app.features.home.room.detail.RoomDetailFragment
+import im.vector.app.features.home.room.list.RoomListFragment
+import im.vector.app.features.login.LoginCaptchaFragment
+import im.vector.app.features.login.LoginFragment
+import im.vector.app.features.login.LoginGenericTextInputFormFragment
+import im.vector.app.features.login.LoginResetPasswordFragment
+import im.vector.app.features.login.LoginResetPasswordMailConfirmationFragment
+import im.vector.app.features.login.LoginResetPasswordSuccessFragment
+import im.vector.app.features.login.LoginServerSelectionFragment
+import im.vector.app.features.login.LoginServerUrlFormFragment
+import im.vector.app.features.login.LoginSignUpSignInSelectionFragment
+import im.vector.app.features.login.LoginSignUpSignInSsoFragment
+import im.vector.app.features.login.LoginSplashFragment
+import im.vector.app.features.login.LoginWaitForEmailFragment
+import im.vector.app.features.login.LoginWebFragment
+import im.vector.app.features.login.terms.LoginTermsFragment
+import im.vector.app.features.pin.PinFragment
+import im.vector.app.features.qrcode.QrCodeScannerFragment
+import im.vector.app.features.reactions.EmojiChooserFragment
+import im.vector.app.features.reactions.EmojiSearchResultFragment
+import im.vector.app.features.roomdirectory.PublicRoomsFragment
+import im.vector.app.features.roomdirectory.createroom.CreateRoomFragment
+import im.vector.app.features.roomdirectory.picker.RoomDirectoryPickerFragment
+import im.vector.app.features.roomdirectory.roompreview.RoomPreviewNoPreviewFragment
+import im.vector.app.features.roommemberprofile.RoomMemberProfileFragment
+import im.vector.app.features.roommemberprofile.devices.DeviceListFragment
+import im.vector.app.features.roommemberprofile.devices.DeviceTrustInfoActionFragment
+import im.vector.app.features.roomprofile.RoomProfileFragment
+import im.vector.app.features.roomprofile.banned.RoomBannedMemberListFragment
+import im.vector.app.features.roomprofile.members.RoomMemberListFragment
+import im.vector.app.features.roomprofile.settings.RoomSettingsFragment
+import im.vector.app.features.roomprofile.uploads.RoomUploadsFragment
+import im.vector.app.features.roomprofile.uploads.files.RoomUploadsFilesFragment
+import im.vector.app.features.roomprofile.uploads.media.RoomUploadsMediaFragment
+import im.vector.app.features.settings.VectorSettingsAdvancedNotificationPreferenceFragment
+import im.vector.app.features.settings.VectorSettingsHelpAboutFragment
+import im.vector.app.features.settings.VectorSettingsLabsFragment
+import im.vector.app.features.settings.VectorSettingsNotificationPreferenceFragment
+import im.vector.app.features.settings.VectorSettingsNotificationsTroubleshootFragment
+import im.vector.app.features.settings.VectorSettingsPreferencesFragment
+import im.vector.app.features.settings.VectorSettingsSecurityPrivacyFragment
+import im.vector.app.features.settings.account.deactivation.DeactivateAccountFragment
+import im.vector.app.features.settings.crosssigning.CrossSigningSettingsFragment
+import im.vector.app.features.settings.devices.VectorSettingsDevicesFragment
+import im.vector.app.features.settings.devtools.AccountDataFragment
+import im.vector.app.features.settings.devtools.GossipingEventsPaperTrailFragment
+import im.vector.app.features.settings.devtools.IncomingKeyRequestListFragment
+import im.vector.app.features.settings.devtools.KeyRequestsFragment
+import im.vector.app.features.settings.devtools.OutgoingKeyRequestListFragment
+import im.vector.app.features.settings.ignored.VectorSettingsIgnoredUsersFragment
+import im.vector.app.features.settings.locale.LocalePickerFragment
+import im.vector.app.features.settings.push.PushGatewaysFragment
+import im.vector.app.features.share.IncomingShareFragment
+import im.vector.app.features.signout.soft.SoftLogoutFragment
+import im.vector.app.features.terms.ReviewTermsFragment
+import im.vector.app.features.userdirectory.KnownUsersFragment
+import im.vector.app.features.userdirectory.UserDirectoryFragment
+import im.vector.app.features.widgets.WidgetFragment
 
 @Module
 interface FragmentModule {